Commit Graph

32447 Commits

Author SHA1 Message Date
Raphaël Doursenaud
d34c4518d2 Removed BOM from UTF-8 files
Fix: convert line delimiters (regis)

Conflicts:
	htdocs/core/filemanagerdol/browser/default/js/common.js
	htdocs/core/filemanagerdol/browser/default/js/fckxml.js
2012-07-28 19:04:50 +02:00
Regis Houssin
49bacc6fda Merge pull request #267 from marcosgdf/trans-and-link-fixes
Fixed es_ES translations and some BackToList links
2012-07-28 09:36:28 -07:00
Regis Houssin
e7a994360e Merge pull request #266 from marcosgdf/typo-spanish-translation
Typo in es_ES translation
2012-07-28 09:35:28 -07:00
Regis Houssin
1dd14d35f7 Fix: add null value in class method 2012-07-28 18:32:54 +02:00
Regis Houssin
edbf104a7b Merge pull request #265 from marcosgdf/fix-commande-addline
Fixed 2 fatal errors in commande/fiche.php and a SQL problem too
2012-07-28 09:11:16 -07:00
Marcos García
241241bf0a Fixed some problems with translations 2012-07-28 17:34:21 +02:00
Marcos García
706b637389 Removed unused BackToList link params 2012-07-28 17:20:17 +02:00
Marcos García
f9dbc6d9be Merge branch 'develop' into typo-spanish-translation
Conflicts:
	htdocs/langs/es_ES/products.lang
2012-07-28 16:31:34 +02:00
Marcos García
bb8dd6ded6 Fixed 2 fatal errors in commande/fiche.php and a SQL problem too 2012-07-28 16:22:01 +02:00
Regis Houssin
2a3a8f5aa5 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-07-28 12:35:47 +02:00
Regis Houssin
251640561f Fix: strict mode happy hour 2012-07-28 12:35:11 +02:00
Laurent Destailleur
859c6cee97 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-07-28 12:32:06 +02:00
Laurent Destailleur
160997cbbe Fix: Bad test 2012-07-28 12:31:37 +02:00
Regis Houssin
a157327859 Fix: strict mode paradise 2012-07-28 11:28:37 +02:00
Regis Houssin
3390a514e1 Fix: include wrong class 2012-07-28 09:57:04 +02:00
Regis Houssin
1e07ed6af6 Fix: broken link 2012-07-28 09:54:47 +02:00
Regis Houssin
a3080acab4 Merge pull request #262 from marcosgdf/minor-fixes-develop
Pull request #254 into develop
2012-07-28 00:31:51 -07:00
Regis Houssin
5fb22d689b Fix: best practice 2012-07-28 09:10:09 +02:00
Laurent Destailleur
bf94d05293 New: Add great britain provinces 2012-07-28 03:12:34 +02:00
Laurent Destailleur
70eb10daf7 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-07-28 00:57:42 +02:00
Laurent Destailleur
7883124958 New: [ task #454 ] Add "No category" into filters on category 2012-07-28 00:53:51 +02:00
Marcos García
c14d9ce13b Typo in es_ES translation 2012-07-28 00:00:46 +02:00
Laurent Destailleur
f31277401b New: [ task #454 ] Add "No category" into filters on category 2012-07-27 23:40:28 +02:00
Laurent Destailleur
eb79646315 Fix: restore correct test (empty instead of ! isset) 2012-07-27 23:30:23 +02:00
Laurent Destailleur
a2e745fab6 Fix: Function return was missing in some case. Save bug of empty
category.
2012-07-27 23:21:22 +02:00
Marcos García
2204c09e5a Applied commits 16-22 2012-07-27 23:04:05 +02:00
Marcos García
a6c8838b8f Applied patches 9-15 2012-07-27 21:27:03 +02:00
Laurent Destailleur
bd20ab3500 New: Auto check box on page to edit interface options of user. 2012-07-27 20:47:17 +02:00
Laurent Destailleur
1c557a96bd Prepare task 473 2012-07-27 19:26:54 +02:00
Laurent Destailleur
86ac10995f Fix perm 2012-07-27 19:26:38 +02:00
Laurent Destailleur
42d6ed91f7 Fix: Closing tab 2012-07-27 18:41:52 +02:00
Marcos García
5fd7fcb6c4 Applied commits 1-8 2012-07-27 18:40:06 +02:00
Laurent Destailleur
1fa2d93f07 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-07-27 18:36:34 +02:00
Laurent Destailleur
56ced6e5f0 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2012-07-27 16:04:28 +02:00
Laurent Destailleur
0b048ebb94 [ bug #40 ] Export de donnes dangereux 2012-07-27 16:03:20 +02:00
Regis Houssin
6a69b55e5e Fix: tabulation 2012-07-27 14:10:56 +02:00
Raphaël Doursenaud
9ffb6317cf Fix: Allows to use a comma decimal separator in supplier invoices
payments
2012-07-27 13:54:16 +02:00
Regis Houssin
723df0dd43 Fix: changelog 2012-07-26 21:09:07 +02:00
Regis Houssin
20ed6bd5c5 Fix: Bug #460 - Wrong entity assignment when creating a warehouse 2012-07-26 20:52:05 +02:00
Regis Houssin
79181f9183 Fix: add external user filter 2012-07-26 18:24:54 +02:00
Regis Houssin
b2317fd3ee Fix: external user confidentiality 2012-07-26 18:11:06 +02:00
Regis Houssin
5318fb54d5 Fix: bad path 2012-07-26 17:07:10 +02:00
Laurent Destailleur
71157aec84 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-07-26 16:28:04 +02:00
Regis Houssin
b83fbf981d Fix: problem with double quote 2012-07-26 14:33:25 +02:00
Regis Houssin
a6758c2557 Fix: use span instead div for align image warning 2012-07-26 11:34:43 +02:00
Regis Houssin
28a98f6bd9 Fix: wrong action 2012-07-26 10:45:19 +02:00
Laurent Destailleur
56da9baf2c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-07-26 09:37:21 +02:00
Laurent Destailleur
6311da9428 Qual: Removed error we need to keep 2012-07-26 09:34:51 +02:00
Regis Houssin
68196e638a Fix: compatibility with edit in place 2012-07-26 09:32:54 +02:00
Laurent Destailleur
ac81e1732e Fix: bad field name 2012-07-26 03:01:15 +02:00