lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
37,748 Commits 43 Branches 150 Tags 886 MiB
3.4
Commit Graph

32489 Commits

Author SHA1 Message Date
Laurent Destailleur
e5eb5492e9 Fix: W3C 2013-06-23 13:03:06 +02:00
Laurent Destailleur
fc62f6f7d6 Fix: Search filter was lost 2013-06-23 13:00:02 +02:00
Laurent Destailleur
f2c268f72c Fix: Missing theme for autofill 2013-06-23 12:43:06 +02:00
Laurent Destailleur
253ce19bc1 Fix: Bad position of field 2013-06-21 15:26:46 +02:00
Laurent Destailleur
7e748f26a6 Fix: all forms must react same way with option optimize_small_screen 2013-06-20 16:39:17 +02:00
Laurent Destailleur
a1f9b22210 Fix: Missing icon 2013-06-20 16:21:54 +02:00
Laurent Destailleur
a749e2bfaa Fix: Still working on css debug. bureau2crea and cameleo are too 
bugged. I disable them with jmobile to have things working correctly.

Conflicts:
	htdocs/theme/bureau2crea/style.css.php
 2013-06-20 16:20:31 +02:00
Laurent Destailleur
4268ca0de2 Missing space 2013-06-20 09:40:02 +02:00
Laurent Destailleur
66d02240f5 Fix: Missing translation 2013-06-20 09:36:36 +02:00
Laurent Destailleur
f987fd2245 Fix: Inconsistency arrays into php function 2013-06-19 23:46:46 +02:00
Laurent Destailleur
ec2e4c8a8b Fix: parenthesis at wrong place 2013-06-19 22:58:35 +02:00
Laurent Destailleur
c0b4ff3616 Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-06-19 19:54:00 +02:00
Laurent Destailleur
aaad4d3474 Fix: Menu cheque depends on bank module and not invoice. 2013-06-19 19:52:20 +02:00
Laurent Destailleur
9f39671886 Fix: Bad translation 2013-06-19 19:40:19 +02:00
Laurent Destailleur
ad49f965d5 Merge pull request #1060 from FHenry/3.3 
Fix trad holidays module
 2013-06-19 09:34:10 -07:00
Laurent Destailleur
d6d7665e65 Merge pull request #1059 from marcosgdf/translations 
Fixed es_ES translation typo
 2013-06-19 09:34:03 -07:00
Laurent Destailleur
6779724dc0 Merge pull request #1055 from FHenry/3.4 
Fix ODT to PDF exec scripts path
 2013-06-19 09:30:11 -07:00
Laurent Destailleur
09317e2034 Fix: Pb with firstname/lastname and font size 2013-06-19 18:12:05 +02:00
Laurent Destailleur
5cb2ba3909 Several fixes in CSS 
Conflicts:
	htdocs/core/menus/standard/empty.php
 2013-06-19 17:02:09 +02:00
Laurent Destailleur
e92e6f7131 Fix: Icon of wrong version 2013-06-19 17:00:11 +02:00
Laurent Destailleur
9bd41e94b5 Fix: Pb in css 2013-06-19 17:00:01 +02:00
Florian Henry
035edc12ce Fix [ bug #945 ] error adding a service 2013-06-19 14:41:18 +02:00
Laurent Destailleur
d32b36ce29 Fix: css with jmobile 2013-06-19 14:04:25 +02:00
Florian Henry
835b8e9d7e Fix trad holidays 2013-06-19 11:23:43 +02:00
Florian Henry
ee1e266774 Fix trad holidays module 2013-06-19 11:22:53 +02:00
Marcos García
76d9ba6a43 Fixed es_ES translation typo 2013-06-19 10:24:24 +02:00
Marcos García
676191c1f9 Fix: [ bug #947 ] Can't create proposal lines with unit price = 0 2013-06-19 10:22:46 +02:00
Florian Henry
08e0e8244a Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4 2013-06-19 10:07:32 +02:00
Laurent Destailleur
965b173451 Fix: hooks for leftmenu must not be loaded if left menu hidden, also 
hooks were lost into page search_page.
 2013-06-19 00:12:35 +02:00
Laurent Destailleur
f0aac521d0 Fix: civility label 2013-06-18 23:28:55 +02:00
Laurent Destailleur
8f60d60e8d Fix: Bad return url 2013-06-18 22:12:49 +02:00
Laurent Destailleur
c45cd3aa1c Fix: Tab must not always be visible 2013-06-18 21:44:18 +02:00
Florian Henry
cac7cbebd4 Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4 2013-06-18 09:46:49 +02:00
Florian Henry
dc5db0c137 fix ODT to PDF script path 2013-06-18 09:07:53 +02:00
Laurent Destailleur
e8e710fd0c Fix: Translation 2013-06-17 23:53:03 +02:00
Laurent Destailleur
562fa43d9d Fix: Message is not clear enough. 
Fix: Var was not initialized.
 2013-06-17 23:24:53 +02:00
Florian Henry
83116b5627 Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4 2013-06-17 16:23:54 +02:00
Laurent Destailleur
8b73b2b4f3 Fix: Solve some problem of redirect when logout 
Conflicts:
	htdocs/user/logout.php
 2013-06-17 14:54:44 +02:00
Florian Henry
7cc7e8392d Fix ODT to PDF exec scripts path 2013-06-17 11:58:59 +02:00
Laurent Destailleur
91068a4476 Fix: Pb into form output 
Conflicts:
	htdocs/core/class/html.formfile.class.php
 2013-06-16 20:16:05 +02:00
Laurent Destailleur
8410ad1933 Fix: CSS 2013-06-16 12:03:27 +02:00
Laurent Destailleur
706b0d562f Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-06-15 01:09:08 +02:00
Laurent Destailleur
0a9cf26a32 Fix: Bad closing of div 2013-06-14 19:51:53 +02:00
Laurent Destailleur
2f386b1b36 Fix: Bad closing of div 2013-06-14 19:43:45 +02:00
Laurent Destailleur
3b88142ba8 Fix: Import of extra field for members 2013-06-14 02:41:08 +02:00
Laurent Destailleur
13b3a3c850 Fix: Export of extra field for members 2013-06-14 02:35:30 +02:00
Laurent Destailleur
a9edbf4f24 Fix: Bad size of image 2013-06-14 02:25:44 +02:00
Laurent Destailleur
8ed5dfeded Fix: Bad styles of html elements 2013-06-14 02:15:43 +02:00
Laurent Destailleur
b3ca9de399 Fix: Update select with list 2013-06-14 02:09:34 +02:00
Laurent Destailleur
c1b21d1480 Fix: Option not working 2013-06-14 01:29:05 +02:00
Laurent Destailleur
396cbcec62 Fix: Do not update twice level 1 
Conflicts:
	htdocs/product/admin/product_tools.php
 2013-06-14 01:23:54 +02:00
Laurent Destailleur
b3e81afae4 Merge pull request #1045 from FHenry/3.4 
Fix [ bug #934 ] Impossible de créer une facture prédéfinie (pgsql)
 2013-06-13 16:05:01 -07:00
Florian Henry
184f1a4b15 revert Jean modif 2013-06-14 00:44:58 +02:00
Laurent Destailleur
5f60a7c88c Fix: Multiprices were not update by mass vat update tool 2013-06-14 00:11:57 +02:00
Laurent Destailleur
d3a500d6c4 Fix: Missing price level for triggers 2013-06-13 23:26:06 +02:00
Laurent Destailleur
8757fc1dba Fix: css pb with jmobile 2013-06-13 21:43:19 +02:00
Florian Henry
2704ba5f36 Fix bug on attach element in element.php (simply not work before...) 2013-06-13 18:11:23 +02:00
Laurent Destailleur
d9f5151c39 Fix: Bad default value for finished property 2013-06-13 15:53:17 +02:00
Florian Henry
eb298e0557 Merge file from Jean Heimberger 2013-06-13 15:24:09 +02:00
Florian Henry
1d8b2fa2c1 Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4 2013-06-13 15:08:09 +02:00
Florian Henry
1ecc24216f Fix [ bug #934 ] Impossible de créer une facture prédéfinie (pgsql) 2013-06-13 15:07:50 +02:00
Florian Henry
fb0a99cb55 Fix [ bug #934 ] Impossible de créer une facture prédéfinie (pgsql) 2013-06-13 15:05:19 +02:00
Laurent Destailleur
32244743d2 Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-06-12 22:12:37 +02:00
Laurent Destailleur
977cd8ca4c Fix: filtering was deleting data ! 2013-06-12 22:12:06 +02:00
Laurent Destailleur
c7868e2471 Fix: css 2013-06-12 21:57:09 +02:00
Laurent Destailleur
2483f044c5 Fix: Trans 2013-06-12 16:28:36 +02:00
Laurent Destailleur
4ba24ed8d7 Fix: Missing empty value 2013-06-11 12:58:52 +02:00
Laurent Destailleur
897d1251c8 Fix: Better fix for cleaning vars (i'm tired today) 2013-06-11 12:10:02 +02:00
Laurent Destailleur
40cd45c166 Fix: Better fix for cleaning vars 2013-06-11 12:01:12 +02:00
Laurent Destailleur
5f9f709a70 Fix: vars must be cleaned for next call 2013-06-11 10:21:28 +02:00
Laurent Destailleur
6872b3f0c4 Trans: Add missing entries 2013-06-11 10:06:22 +02:00
Laurent Destailleur
f4fd71d1f9 Fix: Bad position of currency for USD 2013-06-11 02:05:40 +02:00
Laurent Destailleur
50ff8ab52e Update turkish 2013-06-11 01:02:44 +02:00
Laurent Destailleur
b35274bd30 Update to turkish 2013-06-11 00:28:42 +02:00
Laurent Destailleur
1f95c5d59f Revert "Fix: hookmanager code" 
This reverts commit 2bdf900db9.
 2013-06-11 00:08:15 +02:00
Regis Houssin
2bdf900db9 Fix: hookmanager code 
Conflicts:
	htdocs/core/lib/pdf.lib.php

Change-Id: I4dac5a939abdcbe60fcd1bb21465fabde1324089
 2013-06-10 19:51:07 +02:00
Laurent Destailleur
9ce993fada Fix: skin 2013-06-10 19:18:36 +02:00
Laurent Destailleur
88291e423f Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-06-09 18:24:52 +02:00
Laurent Destailleur
f78240c067 Doxygen 2013-06-09 18:24:30 +02:00
Florian Henry
4f438224d7 Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4 2013-06-09 16:56:47 +02:00
Florian Henry
646be9b984 Fix bug on extrafeild type price and double 2013-06-09 16:56:29 +02:00
Laurent Destailleur
050819ce0b Fix: dead code 2013-06-09 16:15:12 +02:00
Laurent Destailleur
9bb539843f Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-06-09 16:14:19 +02:00
Laurent Destailleur
e85b72e452 Fix: Bad error management 2013-06-09 15:59:51 +02:00
Marcos García
3b28de0a07 Fixed some translation problems 2013-06-08 21:57:57 +02:00
Marcos García
cf6bfcc9c4 Missing translations 2013-06-08 20:31:39 +02:00
Marcos García
a06de736c2 Merge branch '3.4' into translations 2013-06-08 20:29:07 +02:00
Marcos García
17efbd41c7 Improved es_ES translation 2013-06-08 20:18:09 +02:00
Marcos García
000de9530d Fixed wrong translation key and and improved es_ES translations 2013-06-08 20:15:48 +02:00
Marcos García
3cff899b44 Removed debug message and wrong translation key 2013-06-08 20:01:51 +02:00
Marcos García
532c56002d Entities problem with error message in predefined invoice creation 2013-06-08 19:07:13 +02:00
Laurent Destailleur
bd4ca9f1ed Merge remote-tracking branch 'origin/3.3' into 3.4 2013-06-08 16:55:49 +02:00
Laurent Destailleur
49dcc32374 Fix: Param lang forbidden into price function 2013-06-08 16:53:26 +02:00
Laurent Destailleur
b4abe58237 Merge remote-tracking branch 'origin/3.3' into 3.4 
Conflicts:
	htdocs/core/lib/pdf.lib.php
 2013-06-08 16:49:02 +02:00
Laurent Destailleur
0ffb01e347 Fix: Remove duplicate key 2013-06-08 16:35:52 +02:00
Laurent Destailleur
e13974b5f3 Fix: tcpdf bug 2013-06-08 15:29:27 +02:00
Laurent Destailleur
2c71c898eb Fix: param lang not provided to price function 2013-06-08 15:21:47 +02:00
Laurent Destailleur
afbe6c1808 Fix: translation 2013-06-08 14:56:40 +02:00
Laurent Destailleur
3c9fef8eea Fix: choice of percentage was lost 2013-06-08 01:33:16 +02:00
Laurent Destailleur
dd43f7a890 Fix: memory not freed 2013-06-07 19:12:38 +02:00
Laurent Destailleur
a88a3bb877 Look: More neutral css to match with other skins 2013-06-07 16:39:29 +02:00
Laurent Destailleur
a27d71f083 Fix: Miscellaneous fixes into cachdesk module: 
- Missing footer in cashdesk module
- Wrong field label
- Do not use limit list (Freeze when too many product)
 2013-06-07 15:59:47 +02:00
Laurent Destailleur
c78d5aa4a7 Fix: Bad param 'zone' into printCommon 2013-06-07 14:52:25 +02:00
Laurent Destailleur
693f4f3b8b Fix: Pb of offset in numbering. Add also phpunit test to detect and test 
fix.

Conflicts:
	test/phpunit/NumberingModulesTest.php
 2013-06-06 21:25:10 +02:00
Laurent Destailleur
4bc8cbc993 Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-06-06 09:43:02 +02:00
Laurent Destailleur
bf8fd7d34f Fix: CSS 2013-06-06 09:42:39 +02:00
Laurent Destailleur
8bad0fc97d Merge pull request #1024 from csalvador/updateline-bug 
fixed bug when editing a supplier order line
 2013-06-05 15:41:02 -07:00
Laurent Destailleur
56f9d8f50c Fix: missing style 2013-06-05 22:10:43 +02:00
Laurent Destailleur
0b481f285a Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-06-05 21:56:37 +02:00
Laurent Destailleur
61d5359f23 Fix: Uniformize menu entries 2013-06-05 21:55:51 +02:00
Cédric Salvador
37ef86379f fixed bug when editing a supplier order line 2013-06-05 18:19:50 +02:00
simnandez
097fbaacd0 Fix: Warning missing argument 2 into withdrawals 2013-06-05 15:09:30 +02:00
simnandez
a4841dacda Fix: Warning missing argument 2 into withdrawals 2013-06-05 15:09:13 +02:00
Laurent Destailleur
e4a3929a5c Fix: Minor fixes into style. 2013-06-05 14:23:49 +02:00
Laurent Destailleur
7aa145ae6a Fix: Previous fix was not complete 2013-06-05 11:09:54 +02:00
Laurent Destailleur
650158dd59 Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-06-05 10:51:09 +02:00
Laurent Destailleur
f83ab0de70 Fix: ModelDoc Activation bug 2013-06-05 10:49:12 +02:00
Laurent Destailleur
94d1f23721 Merge pull request #1019 from GPCsolutions/3.3-societefix 
Fixed field name
 2013-06-04 10:19:44 -07:00
Raphaël Doursenaud
880a27f827 Fixed field name 2013-06-04 18:40:46 +02:00
Laurent Destailleur
3cb6e196b6 Fix: [ bug #919 ] SQL error in product/stock/product.php 2013-06-04 00:31:54 +02:00
Laurent Destailleur
b1a280de32 Fix: error message 2013-06-03 23:11:36 +02:00
Laurent Destailleur
22bde298de Fix: First permission must start with 1 2013-06-03 23:06:15 +02:00
Laurent Destailleur
26ac8f9f28 Fix: Missing translation 2013-06-03 22:17:03 +02:00
Laurent Destailleur
12973dbdb4 Look: Minor enhancement 
Fix: Option to fix bug to send email on by default.
 2013-06-03 22:06:28 +02:00
Laurent Destailleur
205335f347 Fix: Readonly mode for email was ok for eldy only. 2013-06-03 20:16:07 +02:00
Laurent Destailleur
e871ea64eb Fix: Regression 2013-06-03 19:52:34 +02:00
Laurent Destailleur
b4c5114ee6 Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-06-03 19:26:01 +02:00
Laurent Destailleur
1ccde6ad04 Fix: syntax error 2013-06-03 19:25:12 +02:00
Laurent Destailleur
1ff175f14e Fix: Bad regex 2013-06-03 12:46:25 +02:00
Laurent Destailleur
4b3413c84c Fix: Loading of boxes from external modules 2013-06-03 12:43:14 +02:00
Laurent Destailleur
6cf1d25529 Merge remote-tracking branch 'origin/3.3' into 3.4 
Conflicts:
	ChangeLog
 2013-06-03 11:09:40 +02:00
Laurent Destailleur
4f0758f9b1 Merge pull request #1011 from marcosgdf/minor 
Avoid warnings
 2013-06-02 04:29:23 -07:00
Laurent Destailleur
25e8b39ca8 Merge pull request #1010 from marcosgdf/bug-908 
Fix: [bug #908] Erreur lors de la configuration du module
 2013-06-02 04:17:48 -07:00
Laurent Destailleur
b75893b3de Merge pull request #1013 from marcosgdf/style 
Fixed empty table when few modules are activated in product card view
 2013-06-02 04:07:49 -07:00
Marcos García
c12da33dcd Fixed empty table when few modules are activated in product card view 2013-06-02 00:37:33 +02:00
Laurent Destailleur
c5783215c4 Fix: Var not initialized 
Fix: Pb of duplicate run of javascript with jmobile
 2013-06-01 23:46:36 +02:00
Marcos García
cf1d269f15 Avoid warnings 2013-06-01 16:11:45 +02:00
Marcos García
7b20757449 Fix: [bug #908] Erreur lors de la configuration du module 2013-06-01 15:51:17 +02:00
Marcos García
8ae0939ae5 Fixed bug #903: Fatal error: Call to undefined function dol_get_first_day() in htdocs/commande/liste.php 2013-06-01 15:39:45 +02:00
Laurent Destailleur
520101bdfb Fix: Missing vat rate 2013-06-01 02:52:25 +02:00
Laurent Destailleur
9b96e38a35 Fix: Update vat rates for canada 
Conflicts:
	htdocs/langs/fr_CA/main.lang
 2013-06-01 02:49:44 +02:00
Laurent Destailleur
0b3a52395d Fix: Missing mayotte 2013-06-01 02:21:39 +02:00
Laurent Destailleur
b3b80701fd Fix: Bug with jmobile 2013-06-01 02:03:19 +02:00
Laurent Destailleur
4b0b6fdd55 Fix: Avoid pb with jmobile 2013-06-01 00:24:13 +02:00
Raphaël Doursenaud
9f1eb0676b Fix install with PostgreSQL 
The language should be lowercase and unquoted
 2013-06-01 00:02:13 +02:00
Laurent Destailleur
743da5a214 Fix: function to get localtax1 or 2 value from vat rate return bad value 
when countries differs.

Conflicts:
	htdocs/langs/fr_CA/main.lang
 2013-05-31 21:33:48 +02:00
Laurent Destailleur
da73a8d84c Fix: syntax error 
Fix: Bad field param
 2013-05-31 16:39:34 +02:00
Laurent Destailleur
a5962a410e Fix: Bad param used 2013-05-31 16:35:32 +02:00
Laurent Destailleur
5254f102ba Fix: Solve duplicate js and solve jmobile problem of cache. 2013-05-31 16:34:02 +02:00
Laurent Destailleur
67a6313487 Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4 2013-05-31 08:02:53 +02:00
Laurent Destailleur
9c049e73af Fix: Support pages were not independants. 2013-05-30 23:53:12 +02:00
Laurent Destailleur
361e291d2d Fix: Lang not loaded 2013-05-30 19:36:00 +02:00
simnandez
5fa2598a6f Fix: [ bug #916 ] Same for Thirds and Members 2013-05-30 17:58:48 +02:00
Marcos García
f6057bd794 Reverting PR #1002 
Incorrect translation that shouldn't have been accepted
 2013-05-30 16:48:04 +02:00
Laurent Destailleur
e6bca3c549 Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-05-29 22:42:48 +02:00
Laurent Destailleur
7413e33599 Fix: Bad page code 2013-05-29 22:41:57 +02:00
Laurent Destailleur
d1d329a6a2 Fix: Navigation into supplier invoices 2013-05-29 21:20:04 +02:00
Laurent Destailleur
4fa99a86ed Fix: Bad permissions 2013-05-29 21:18:21 +02:00
simnandez
00395c87a8 Fix: [ bug #916 ] Products complementary attributes, imports and 
multicompany
Fix: [ bug #917 ] Missing field type in products complementary
attributes imports

No Changelog Update need, because complementary attributes is new in 3.4
 2013-05-29 18:17:39 +02:00
Florian Henry
8b2dc49734 update trans 2013-05-29 16:06:04 +02:00
Florian Henry
eb6e6ecc71 update trans 2013-05-29 16:05:35 +02:00
Florian Henry
7ab46b8e7b add translation 2013-05-29 15:59:16 +02:00
Florian Henry
b563877f5a Add translation from pcbelt@hotmail.com(Rodrigo Beltrán) get from 
assodolibarr@gmail.com
 2013-05-29 15:56:32 +02:00
Laurent Destailleur
b2600e8880 Fix: Missing trans 2013-05-29 02:20:30 +02:00
Laurent Destailleur
1cb33c43bd Merge remote-tracking branch 'origin/3.3' into 3.4 
Conflicts:
	htdocs/comm/action/listactions.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/lib/agenda.lib.php
	htdocs/product/liste.php
 2013-05-29 01:30:36 +02:00
Laurent Destailleur
f8e019248d Fix: But siwtiching to auguria menu. 2013-05-29 01:24:57 +02:00
Laurent Destailleur
6d2db1c09f Merge pull request #977 from cbattarel/3.3 
[ bug #806 ] Tasks are ordered alphabetically instead of chronological order
 2013-05-28 15:14:02 -07:00
Florian Henry
8a726ab51b Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4 2013-05-28 21:51:11 +02:00
Florian Henry
3ddb410e2e Change comment on dol_include_once method 2013-05-28 17:53:56 +02:00
simnandez
485c7bc477 Fix: Trad categories more accurate 2013-05-28 15:19:24 +02:00
simnandez
0c62942f03 [ bug #914 ] It is not possible to validate a supplier invoice 2013-05-28 09:28:31 +02:00
Laurent Destailleur
5090cfee54 Fix: Clear of list broken 2013-05-27 16:12:33 +02:00
Laurent Destailleur
37119e70f1 Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-05-27 12:52:11 +02:00
Laurent Destailleur
4be5ffc937 Fix: Syntax error 2013-05-26 15:38:17 +02:00
Florian Henry
f543f00024 Fix PGSQL Bugs 
Removing parenthesis make query works for MySQL and PgSQL
 2013-05-26 10:34:00 +02:00
Florian Henry
56556ba222 Fix [ bug #911 ] Reorder intervention do not work 2013-05-26 10:15:43 +02:00
Laurent Destailleur
2005ce8d6e Fix: Error with jmobile 2013-05-26 05:02:46 +02:00
Laurent Destailleur
f054032e79 Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-05-26 04:06:34 +02:00
Laurent Destailleur
268c1cfa29 Fix: Removed useless file (not correctly defined) to avoid cache 
problems
 2013-05-26 03:57:34 +02:00
Florian Henry
557756058f Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4 
Conflicts:
	htdocs/install/mysql/migration/3.3.0-3.4.0.sql

Change-Id: I1754b68e9acdf1c7e6024afe95d9ded8e0726b41
 2013-05-25 20:58:02 +02:00
Laurent Destailleur
15402b9286 Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-05-25 20:43:31 +02:00
Laurent Destailleur
e3e00b034b Fix: Dir with linked files was not renamed when invoices was renamed 
with its final ref (linked files were lost)
Fix: Ref visible into message was wrong.
Fix: Bad counting of product/service available
 2013-05-25 20:43:01 +02:00
Florian Henry
c61f7b6390 Fix [ bug #911 ] Reorder intervention do not work 2013-05-25 19:48:49 +02:00
Regis Houssin
309f59fb00 Fix: wrong field name 2013-05-25 19:03:16 +02:00
Laurent Destailleur
9ffbed07fe Fix: More consistent fix 2013-05-25 18:16:13 +02:00
Laurent Destailleur
8fa9a60bc6 Fix: Bad field size 2013-05-25 18:12:07 +02:00
Laurent Destailleur
2a96172294 Fix: Pb in synchro update 2013-05-25 18:12:00 +02:00
Laurent Destailleur
f16026b79c Fix: cyclic updates 2013-05-25 18:11:54 +02:00
Laurent Destailleur
99c657255e Fix: Bug erase member data 2013-05-25 18:11:42 +02:00
Florian Henry
8656a9f417 Fix [ bug #895 ] Description is lost when adding a new predefined 
product to a contract
 2013-05-25 16:50:55 +02:00
Christophe Battarel
b8c51e3760 sort tasks by start date 2013-05-25 11:49:05 +02:00
Laurent Destailleur
7b13be4653 Merge pull request #978 from atm-maxime/3.4 
Fix : Reset every month with @99 was not working properly (for 3.4 branc...
 2013-05-25 01:59:15 -07:00
Florian Henry
5b02a3a67c Fix search product if multilingue 2013-05-24 22:44:26 +02:00
Florian Henry
0a041a7705 Fix multilangue search product list 2013-05-24 22:39:28 +02:00
Laurent Destailleur
7b29e58760 Merge remote-tracking branch 'origin/3.3' into 3.4 
Conflicts:
	htdocs/core/modules/mailings/thirdparties_services_expired.modules.php
 2013-05-24 19:07:20 +02:00
Laurent Destailleur
eecfbf9670 Fix: Bad link if not supplier defined for product 2013-05-24 18:55:04 +02:00
Laurent Destailleur
9ecb1ddcb4 Fix: Missing translation 2013-05-24 18:53:28 +02:00
Laurent Destailleur
c97d1cb15b Try a fix for some browsers 2013-05-24 18:29:59 +02:00
Laurent Destailleur
7bbdae239f Fix: Removed errors with not defined vars 2013-05-24 14:32:12 +02:00
Maxime Kohlhaas
f66750d5e7 Fix : Reset every month with @99 was not working properly (for 3.4 branch) 2013-05-24 11:23:56 +02:00
Christophe Battarel
b89b7405f8 update function comments header 2013-05-23 22:54:06 +02:00
Christophe Battarel
b96bff4770 [ bug #806 ] Tasks are ordered alphabetically instead of chronological order 2013-05-23 22:51:27 +02:00
Laurent Destailleur
ee84457104 Fix: not defined default value 2013-05-23 10:04:35 +02:00
Laurent Destailleur
3b6c55f908 Fix: Param was renamed 2013-05-22 17:29:25 +02:00
Lukas Prömer
bb42f8384b Fix: 'rights' instead of 'right' 2013-05-22 16:31:50 +02:00
Laurent Destailleur
7856b7f613 Removed warning 2013-05-22 15:52:26 +02:00
Laurent Destailleur
469ae91e70 Fix: regression 2013-05-22 12:02:39 +02:00
Laurent Destailleur
d5d4bc33ba Merge pull request #971 from cbattarel/3.3 
fix wrong construction of description when creating from orders
 2013-05-22 02:57:34 -07:00
Laurent Destailleur
1109527528 Merge pull request #968 from FHenry/3.3 
3.3
 2013-05-22 02:56:06 -07:00
Laurent Destailleur
f21b149361 Merge pull request #969 from FHenry/3.4 
Fix bug in DDLCreateTable
 2013-05-22 02:55:26 -07:00
Christophe Battarel
992600664e fix wrong construction of description when creatin from orders (it was putting a mess on update) 2013-05-22 10:29:31 +02:00
Laurent Destailleur
961ce6e3e2 Fix: Removed error blocking redirect 2013-05-21 19:53:10 +02:00
fhenry
b36a16ed43 Change-Id: I2e25d4b82388f6a0fc83b97f9162a095247e3fa1 2013-05-21 14:32:30 +02:00
fhenry
13ad88832c Fix bug in DDLCreateTable 2013-05-21 14:31:39 +02:00
fhenry
f08ce6d96a Fix bug on DDLCreateDb in Mysql 2013-05-21 14:28:42 +02:00
Laurent Destailleur
4539f6ce58 Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-05-20 19:26:24 +02:00
Laurent Destailleur
6db07ac2d8 Fix: Several bugs into filter on statistics pages. 2013-05-20 19:24:27 +02:00
simnandez
3f1dabb4e2 Trad: Fix Catalan words into Spanish 2013-05-20 18:43:21 +02:00
Laurent Destailleur
53c053604f Merge pull request #966 from FHenry/3.4 
Fix bug on service date strat date end in propal line not recorded
 2013-05-20 09:02:15 -07:00
fhenry
250b6d6502 Fix bug on service date strat date end in propal line not recorded 2013-05-20 17:58:03 +02:00
Laurent Destailleur
71e14df62f Merge remote-tracking branch 'origin/3.3' into 3.4 
Conflicts:
	ChangeLog
	htdocs/comm/propal.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/tpl/freeproductline_create.tpl.php
	htdocs/core/tpl/predefinedproductline_create.tpl.php
 2013-05-20 17:37:08 +02:00
Laurent Destailleur
e00df58153 Merge pull request #965 from grandoc/3.4 
fix: wrong trad
 2013-05-20 07:46:26 -07:00
Laurent Destailleur
416cdd2f9c Merge pull request #956 from cbattarel/3.3 
fix bug : external users should not see costprice and margin infos
 2013-05-20 07:39:39 -07:00
Grand Philippe
5f714f1403 fix: wrong trad 2013-05-20 14:39:27 +02:00
Christophe Battarel
f8ca842685 fix typo error 2013-05-20 10:10:34 +02:00
fhenry
3d409390a5 Revert Class rewrite and ficheinter line trigger 2013-05-19 18:37:38 +02:00
Laurent Destailleur
2ac738d8c4 Merge pull request #955 from FHenry/3.4 
Fix error management and SQL resquest in action comm
 2013-05-19 09:02:00 -07:00
fhenry
a6233a738c Fix trigger in deleteline fiche inter 2013-05-19 14:13:41 +02:00
Christophe Battarel
347fc6d714 fix unauthorized access to margins for external user 2013-05-19 14:04:21 +02:00
Juanjo Menent
afddded13c Merge pull request #962 from marcosgdf/translations 
Corrected translation key BuyingPrice from lang files
 2013-05-19 03:22:54 -07:00
Marcos García
5f4433dbff Missing succes message in margin module config page 2013-05-19 12:09:34 +02:00
Marcos García
08b234ed01 Corrected translation key BuyingPrice from lang files 2013-05-19 12:08:18 +02:00
fhenry
c07d5045d1 Error management 2013-05-19 11:55:03 +02:00
fhenry
6190dddac9 GetElmentURL fichinter instead of ficheinter (to be ok with element of 
fichinter class
 2013-05-19 11:30:35 +02:00
fhenry
94e2ea05d2 Fix trigger ficheinterline 2013-05-19 11:18:45 +02:00
fhenry
a8e1d111c3 Add trigger into ficheinter lines and $user pass trought parameters 
every where
 2013-05-19 10:26:25 +02:00
fhenry
181ce52223 Add ficheinter in GetElementURL for action 2013-05-18 22:17:46 +02:00
fhenry
fefb21a56e Fix bug on Extrafield checkbox 
Fix bug on ActionComm Update
[ task #900 ] Review code of ficheinter.class.php
 2013-05-18 12:17:43 +02:00
simnandez
e2f2ad30ae Fix: Remove windows CR/LF 2013-05-18 09:15:18 +02:00
simnandez
2879a09a03 Fix: Remove windows CR/LF 2013-05-18 09:11:24 +02:00
fhenry
7a6a74f43e Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4 2013-05-17 21:35:11 +02:00
fhenry
e19e9e1c63 Add dol_syslog 2013-05-17 21:27:15 +02:00
fhenry
1eddd86950 Fix Bad Formed Request PGSQL 2013-05-17 21:20:02 +02:00
fhenry
1c1736fa20 Fix bad Warning: Bad formed request converted PGSQL 2013-05-17 19:30:48 +02:00
Christophe Battarel
7efe39495a french translation for CostPrice 2013-05-17 15:18:50 +02:00
Christophe Battarel
e3615d43bd fix bug : external users should not see costprice and margin infos 2013-05-17 15:02:27 +02:00
fhenry
5acdbfa8f0 Fix error management and SQL resquest in action comm 2013-05-17 14:45:54 +02:00
Laurent Destailleur
bd92adf092 Better trans 2013-05-17 11:20:44 +02:00
Grand Philippe
f7f59f962b missing translation for script 2013-05-17 10:35:42 +02:00
Laurent Destailleur
fdd8d2cc5e Fix: to large a href 2013-05-17 01:30:39 +02:00
Laurent Destailleur
b8cd276128 Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-05-17 00:48:02 +02:00
Laurent Destailleur
b3adbf53e5 Fix data for greece 2013-05-17 00:47:50 +02:00
Laurent Destailleur
bab4e1e509 Fix: PHP version was lost 
Fix: split of long text to avoid horizontal scrolls
 2013-05-16 15:15:30 +02:00
Laurent Destailleur
658f0af428 Fix: Removed warning 2013-05-16 15:13:08 +02:00
Laurent Destailleur
ff94849b0c Fix: Security test 2013-05-15 19:57:51 +02:00
Laurent Destailleur
626362780a Fix: Remove not used constant 2013-05-15 17:30:18 +02:00
Laurent Destailleur
d92b46c9f9 Fix: Label missing 
Fix: Cancel not working
 2013-05-14 23:41:57 +02:00
Regis Houssin
047aa8ea29 Fix: avoid error when multiple files uploaded 2013-05-14 15:59:47 +02:00
Regis Houssin
d2aacdb04b Fix: avoid error when multiple files uploaded 2013-05-14 15:58:59 +02:00
Laurent Destailleur
551bcba826 Fix: Try to avoid warning 2013-05-14 10:51:09 +02:00
Laurent Destailleur
f9e0d03b0c Fix: Do not show busy if event not assigned to a user. 2013-05-14 02:46:00 +02:00
Laurent Destailleur
95fac9aace Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-05-14 01:08:58 +02:00
Laurent Destailleur
dc28335ed5 Merge pull request #948 from marcosgdf/translations 
Improved translations
 2013-05-13 16:07:22 -07:00
Laurent Destailleur
3898a77da1 Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-05-14 01:05:18 +02:00
Laurent Destailleur
656f0bee70 Merge pull request #947 from grandoc/3.4 
fix: center bloc was going under left menu
 2013-05-13 16:05:06 -07:00
Laurent Destailleur
80817fd8fb Fix: translation 2013-05-14 01:04:21 +02:00
Laurent Destailleur
d5cc106a3a Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-05-14 01:04:10 +02:00
Laurent Destailleur
273fbdfa0e Merge pull request #942 from FHenry/3.4 
Remove warning if FetchObjectLinked call
 2013-05-13 15:38:28 -07:00
Laurent Destailleur
0eba9ed731 Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-05-14 00:13:53 +02:00
Laurent Destailleur
03cbe6e208 Fix: Can't read link with some styles 2013-05-13 23:46:37 +02:00
simnandez
0c853b3ebd Fix: Some bugs on withdrawal rejects 2013-05-13 17:35:30 +02:00
simnandez
5fe70e0bee Fix: Some bugs on withdrawal rejects 2013-05-13 17:15:23 +02:00
Laurent Destailleur
4fc1fe798c Fix: Bad check on mandatory parameters 2013-05-12 18:20:28 +02:00
fhenry
757c22a204 Fix bug intervention numbering on validation 2013-05-12 17:54:30 +02:00
fhenry
a78b3149fe Remove debug lines 2013-05-12 17:15:45 +02:00
Laurent Destailleur
df6c796413 Fix: [ bug #889 ] Titre civilité ne s'affiche 2013-05-12 17:09:48 +02:00
Laurent Destailleur
d9e477d748 Fix: Civility translation 2013-05-12 16:38:38 +02:00
fhenry
111fc3153b Fix Extrafield selllist bug in PgSQL 2013-05-12 15:45:23 +02:00
Laurent Destailleur
1e76911890 Fix: Not error when migrating from version using exotic menu manager. 
Fix: Delete of member use id
 2013-05-12 15:26:23 +02:00
Marcos García
a37392e34e Removed conflict with margins module name and description (already set in admin.lang) 2013-05-12 12:19:26 +02:00
Marcos García
c61f48a98f Added missing translation in holidays module 2013-05-12 11:36:49 +02:00
Grand Philippe
23a24909e3 fix: center bloc was going under left menu 2013-05-11 17:00:47 +02:00
fhenry
ccb60e549a Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4 2013-05-11 15:48:49 +02:00
Laurent Destailleur
711e7bf9ad Merge remote-tracking branch 'origin/3.3' into 3.4 
Conflicts:
	htdocs/adherents/fiche.php
	htdocs/core/lib/functions.lib.php
 2013-05-11 15:18:52 +02:00
Laurent Destailleur
8a90598b23 Fix: Escape entities 2013-05-11 15:12:42 +02:00
Laurent Destailleur
e4dda125d8 Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3 2013-05-11 15:04:56 +02:00
Laurent Destailleur
526a80dd20 Sec: Param not escaped 
Fix: Bad return error
 2013-05-11 15:04:17 +02:00
Laurent Destailleur
8717b1dd3c Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-05-11 02:16:06 +02:00
Laurent Destailleur
fa4fc8495b Fix: Missing translation key 
Fix: Minor css style missing
Fix: Create draft proposal return error if no contact defined.
Fix: W3C
 2013-05-11 02:12:34 +02:00
fhenry
1a7a8817be Update wrong comment 2013-05-10 18:40:19 +02:00
fhenry
0d13b8d194 Fix previous bug 2013-05-10 18:35:19 +02:00
fhenry
4bb6bd8697 Order result fetchObjectLinked by sourcetype 2013-05-10 18:23:13 +02:00
fhenry
3a05d6c641 Remove warning if FetchObjectLinked call 2013-05-10 17:50:14 +02:00
fhenry
8542a4fd28 Fix date extrafield message old datetimeformat use message in log 2013-05-10 16:34:14 +02:00
fhenry
cdc1e55b26 Fix bug on Extrafield order and propal 2013-05-10 15:39:54 +02:00
fhenry
aab3e0a8a5 Fix Extrafield problem on propal pages 2013-05-10 15:33:28 +02:00
fhenry
0a26be3f04 Fix security leak 2013-05-10 15:11:49 +02:00
fhenry
9427e32e2e Fix security breach (SQL injection) 2013-05-10 15:04:16 +02:00
fhenry
358f051b8e Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4 2013-05-10 14:53:13 +02:00
Laurent Destailleur
9b30f116f1 Fix: Some lib missing when jmobile enabled. 2013-05-10 12:48:11 +02:00
fhenry
a4e8e8eb4b Add fecth extrafield into fetch user class 2013-05-10 12:03:27 +02:00
Laurent Destailleur
ce6e1dc2a6 Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-05-09 23:35:04 +02:00
Laurent Destailleur
e5ef27b168 Fix: no underline onto link that are disabled. 2013-05-09 22:43:01 +02:00
Laurent Destailleur
cc500cceba Fix: form into table is not W3C (broken with some uncommon browsers). 2013-05-09 22:39:31 +02:00
fhenry
30fb1e5e05 Fix bug [ bug #885 ] silent pgsql errors with click2dial 2013-05-09 10:26:04 +02:00
simnandez
5e059fb15d Trad: Added missing translations 2013-05-08 17:59:16 +02:00
Marcos García
e18eb3a6b3 Added missing translations 2013-05-08 17:20:20 +02:00
Laurent Destailleur
9c0839074c Merge pull request #931 from marcosgdf/translations 
Improved translations
 2013-05-08 00:13:10 -07:00
Laurent Destailleur
28c4f9af61 Merge pull request #933 from FHenry/3.4 
Make constraint SQL unique name (Mandatory for PgSQL)
 2013-05-08 00:12:54 -07:00
Laurent Destailleur
68f3a634b6 Merge pull request #932 from marcosgdf/minor 
Removed innecesary whitespace when no picto is displayed
 2013-05-08 00:11:58 -07:00
fhenry
8c37063541 Fix bug [ bug #881 ] some errors 2013-05-07 18:59:28 +02:00
fhenry
68259c51eb Fix [ bug #886 ] Silent pgsql errors in 
/fourn/commande/fiche.php?action=create
 2013-05-07 17:09:31 +02:00
fhenry
37a9686921 Fix bug [ bug #884 ] Warnings on /compta/bank/index.php 2013-05-07 17:06:10 +02:00
fhenry
207f6cea28 Fix [ bug #883 ] Silent pgsql errors in comm/index.php 2013-05-07 16:59:27 +02:00
fhenry
16e06736e6 Fix bug [ bug #882 ] [3.4.0] Can't open WithdrawalReceipt / fichier de 
prélèvement
 2013-05-07 16:50:27 +02:00
fhenry
de4b9b01bf Fix Bug [ bug #880 ] Prelevement section is broken 2013-05-07 15:34:40 +02:00
fhenry
1fc693f692 Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4 2013-05-07 15:21:10 +02:00
fhenry
c623e7913b Update migration script with new idx index unique name opensurvey 2013-05-07 14:31:11 +02:00
Regis Houssin
6ec81375c4 Fix: missing rename note to note_private and add note_public 2013-05-07 14:26:11 +02:00
fhenry
f016517ed1 Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4 2013-05-07 13:55:16 +02:00
Laurent Destailleur
8a82c8c5d5 Merge remote-tracking branch 'origin/3.3' into 3.4 
Conflicts:
	htdocs/contact/class/contact.class.php
	htdocs/margin/agentMargins.php
	htdocs/margin/tabs/productMargins.php
 2013-05-07 13:08:30 +02:00
Laurent Destailleur
c28ef8a557 Fix: Delete deprecated files during install as they create conflicts 
when migrating from old versions.
 2013-05-07 12:51:45 +02:00
fhenry
6427129480 Fix extrafields update/save on User/fiche.php 2013-05-07 12:25:32 +02:00
fhenry
b3f40b900b Make constraint SQL unique name (Mandatory for PgSQL) 2013-05-07 09:26:31 +02:00
Marcos García
0a90af0b99 Fixed untranslated string 2013-05-06 23:31:19 +02:00
Marcos García
c81cf6364a Removed innecesary whitespace when no picto is displayed 2013-05-06 22:59:50 +02:00
Marcos García
20e0fe4b24 Corrected translation key 2013-05-06 22:24:05 +02:00
Marcos García
f9093e00bb Missing es_ES translations 2013-05-06 18:14:16 +02:00
Regis Houssin
3aa049b661 Fix: regression 2013-05-06 17:57:33 +02:00
Juanjo Menent
0e49ec93f9 Merge pull request #929 from marcosgdf/holidays-minor 
Minor changes in holidays module
 2013-05-06 08:17:25 -07:00
Juanjo Menent
a53e4123eb Merge pull request #927 from marcosgdf/holidays-bug 
Fixed bug with holidays log
 2013-05-06 08:14:46 -07:00
Juanjo Menent
192ef564be Merge pull request #924 from marcosgdf/minor 
Replaced addslashes with $this->db->escape
 2013-05-06 08:12:19 -07:00
Marcos García
e1913f4a13 Stetic fix: Select was not valigned 2013-05-06 17:07:20 +02:00
Marcos García
7e11f7466a Missing translations 2013-05-06 17:07:12 +02:00
Marcos García
d7a7f316d3 Replaced "Jours" with DurationDays translation key 2013-05-06 16:51:08 +02:00
Marcos García
d0635901a6 Fixed bug with holidays log 2013-05-06 16:45:03 +02:00
Juanjo Menent
ea2109b635 Merge pull request #922 from marcosgdf/translations 
Corrected es_ES translations
 2013-05-06 07:06:01 -07:00
fhenry
0bb9ee158a Fix trigger call ficher inter create 2013-05-06 13:47:33 +02:00
fhenry
ae4e861147 Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4 2013-05-06 09:54:42 +02:00
fhenry
441ad8c6d0 Fix Trad Fr 2013-05-06 09:53:58 +02:00
fhenry
8bd7c6a763 Fix Trad Fr 2013-05-06 09:53:23 +02:00
Marcos García
e2a73839bc Replaced addslashes with $this->db->escape 2013-05-04 20:17:05 +02:00
Marcos García
a5009fd555 Corrected es_ES translations 2013-05-04 19:35:38 +02:00
fhenry
bdb81803bd Merge branch '3.3' of https://github.com/Dolibarr/dolibarr.git into 3.3 2013-05-04 09:06:32 +02:00
fhenry
95e4474906 Fix bug on PgSQL if user in on another entity than 1 2013-05-03 20:56:58 +02:00
Laurent Destailleur
1c9caeb0d3 Fix: CRLF 2013-05-03 18:33:23 +02:00
Laurent Destailleur
0b228b3a87 Merge remote-tracking branch 'origin/3.3' into 3.4 
Conflicts:
	htdocs/user/perms.php
 2013-05-03 18:33:05 +02:00
Laurent Destailleur
c8ef07a889 Merge branch '3.3' of https://github.com/Dolibarr/dolibarr.git into 3.3 2013-05-03 16:14:27 +02:00
Laurent Destailleur
723bd6f750 Fix: [ bug #872 ] Erreur sur page Accueil Commerciale avec pgsql 
(3.4-beta).
Fix: Permission tab was not visible for external users.
 2013-05-03 16:10:28 +02:00
fhenry
4a1eb1a588 Fix margin calculation 2013-05-03 15:26:20 +02:00
fhenry
a35a44b23e Fix margin calculation problem 2013-05-03 15:22:41 +02:00
Laurent Destailleur
8dcb396fb8 Merge pull request #914 from FHenry/3.4 
fix margin calculation problem
 2013-05-03 04:18:15 -07:00
Laurent Destailleur
b7f3f07fc7 Fix: [ bug #840 ] fichetwothirdright 65% to 55% 2013-05-03 12:13:10 +02:00
Laurent Destailleur
c850d413f4 Fix: [ bug #871 ] Erreur MAJ 3.2 -> 3.3 avec pgsql 2013-05-03 12:00:55 +02:00
Laurent Destailleur
880daa4375 Fix: log file permission during install 2013-05-03 11:51:26 +02:00
fhenry
9038549d0d fix margin calculation problem 2013-05-03 11:50:13 +02:00
Laurent Destailleur
97de97de9d Prepare branch 3.4 2013-05-03 10:17:46 +02:00
Laurent Destailleur
7382a97223 Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/compta/facture/class/facture.class.php
 2013-05-03 10:13:31 +02:00
Laurent Destailleur
c17cd04686 Merge pull request #904 from defrance69/patch-5 
Update modSociete.class.php
 2013-05-03 01:09:37 -07:00
Laurent Destailleur
776655d8c6 Merge pull request #903 from defrance69/patch-4 
Update modProduct.class.php
 2013-05-03 01:09:29 -07:00
Laurent Destailleur
2e4c73ebc4 Fix: Link to phone with tel: must be only onto terminal that support 
protocol "tel:"
 2013-05-03 10:06:54 +02:00
Marcos García
c65620ab62 Merge branch '3.3' of git://github.com/Dolibarr/dolibarr into bug-866 
Conflicts:
	ChangeLog
 2013-05-03 08:17:58 +02:00
Marcos García
f8f4fd3a6f Enhanced fix 2013-05-03 08:16:31 +02:00
Laurent Destailleur
fc0d5abd14 Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	ChangeLog
	htdocs/compta/prelevement/bons.php
	htdocs/compta/prelevement/fiche-stat.php
	htdocs/contact/class/contact.class.php
	htdocs/contrat/class/contrat.class.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/core/modules/modSociete.class.php
	htdocs/projet/fiche.php
	test/phpunit/FilesLibTest.php
 2013-05-03 00:15:02 +02:00
fhenry
f9328f4018 Propal don't move 2013-05-02 23:00:33 +02:00
fhenry
0dbc73a6cc Change-Id: Ie16265e57fa29748fa6c8a1e15ac15ff70786d1d 2013-05-02 22:57:42 +02:00
Laurent Destailleur
77956a5676 Merge pull request #911 from atm-maxime/develop 
Fix : extrafields were save without escape
 2013-05-02 10:43:14 -07:00
Laurent Destailleur
4687350337 Merge pull request #910 from marcosgdf/3.3-translations 
Translation improvements + fixed statut image of returned prelevement
 2013-05-02 10:42:53 -07:00
Laurent Destailleur
3a531f048a Merge pull request #906 from grandoc/3.3 
fix: undefined property
 2013-05-02 10:42:13 -07:00
Laurent Destailleur
f595a7ed0c Merge pull request #905 from FHenry/develop 
Add table extrafield for commande fournisseur
 2013-05-02 10:41:02 -07:00
Laurent Destailleur
fa497cf5fc Fix: Trans and wrap 2013-05-02 18:25:27 +02:00
Laurent Destailleur
9a4cc839bb Fix: Removed warning 
Fix: Parameters are lost
Fix: Hedaer of demo no complete
Fix: Get of country is not complete (bad label)
 2013-05-02 17:41:10 +02:00
fhenry
7e47b37ade Fix [ bug #788 ] Date of linked interventions are not shown 2013-05-02 13:56:14 +02:00
Laurent Destailleur
26f3e920cf Fix: Removed warning. 
Fix: Missing doxygen
 2013-05-02 13:10:39 +02:00
Maxime Kohlhaas
80cf467c47 Fix : extrafields were save without escape 2013-05-02 12:14:29 +02:00
fhenry
5d60ed2462 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-05-01 22:57:33 +02:00
fhenry
8d6f959d31 Fix [ bug #864 ] fournisseur_extrafields 2013-05-01 22:57:03 +02:00
Marcos García
97478ccbf2 Error statut image + not translated strings 2013-05-01 20:54:45 +02:00
Marcos García
95f63a8171 Corrected some es_ES translations and fixed problems with translations not being translated 2013-05-01 20:43:08 +02:00
Marcos García
a9e63610ae Fixed bug #866: Standing order from an invoice suggests invoice total amount instead of remaining to pay 2013-05-01 20:40:29 +02:00
fhenry
3b6efd569d Fix bug [ bug #861 ] Erreur de droit groupe et utilisateur 2013-05-01 17:09:08 +02:00
Laurent Destailleur
cbc56f8044 Fix: W3C 
Fix: Translation
 2013-05-01 16:05:52 +02:00
Laurent Destailleur
5c95018356 Fix: Avoid empty arrays 2013-05-01 16:00:06 +02:00
fhenry
ed9581f77f Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-05-01 14:40:07 +02:00
fhenry
f3480bf502 Merge branch '3.3' of https://github.com/Dolibarr/dolibarr.git into 3.3 2013-05-01 14:38:43 +02:00
Laurent Destailleur
08b656dc0a Look: missing top border 2013-05-01 13:40:24 +02:00
Laurent Destailleur
3daac1d7ab Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-05-01 13:35:01 +02:00
Grand Philippe
7f27801c3c fix: Undefined property: stdClass::$xxx 2013-05-01 09:41:36 +02:00
philippe
8d844a1094 Merge branch '3.3' of https://github.com/Dolibarr/dolibarr.git into 3.3 2013-05-01 09:08:15 +02:00
Laurent Destailleur
5b85adfb90 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/compta/bank/account.php
 2013-05-01 02:35:27 +02:00
Laurent Destailleur
d9e01ae63d Fix: Links when transaction is withdraw has disappeared. 2013-05-01 02:33:29 +02:00
Laurent Destailleur
43d64cca1b Fix: Links when transaction is withdraw has disappeared. 2013-05-01 02:28:14 +02:00
Laurent Destailleur
0a71c84bf4 Fix: Remove separator files. 2013-04-30 23:08:07 +02:00
Laurent Destailleur
7d71be2227 Fix: Import of contact/address not complete and not working with pgsql 
Conflicts:
	htdocs/core/modules/modSociete.class.php
 2013-04-30 22:56:52 +02:00
Laurent Destailleur
c84427bd22 Fix: delete of files with [ and glob. 
Conflicts:
	test/phpunit/FilesLibTest.php
 2013-04-30 22:52:56 +02:00
Laurent Destailleur
786bf9d035 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-04-30 22:39:17 +02:00
fhenry
440912a4d3 fix [ bug #827 ] AJAX search does not respect multiprice level 2013-04-30 21:35:27 +02:00
Laurent Destailleur
8f214a77c5 Fix: Fix error with linux rules 2013-04-30 21:31:35 +02:00
fhenry
ac6e56f058 Fix bug [ bug #861 ] Erreur de droit groupe et utilisateur 2013-04-30 21:10:26 +02:00
Laurent Destailleur
8c064c4883 Fix: Import of contact/address not complete and not working with pgsql 2013-04-30 19:02:02 +02:00
fhenry
0b8d78c4f6 [ bug #865 ] Dolibarr navigation array in project/task do not work 
Conflicts:
	htdocs/projet/fiche.php

Change-Id: I7607f97d21cc695c9b295d94f5abcb64fe25f3af
 2013-04-30 18:23:44 +02:00
Laurent Destailleur
761b2d05d4 Fix: delete of files with [ and glob. 2013-04-30 17:24:11 +02:00
fhenry
59f218ab42 [ bug #865 ] Dolibarr navigation array in project/task do not work 2013-04-30 16:00:30 +02:00
Grand Philippe
114ace6499 fix: undefined property 2013-04-30 15:22:39 +02:00
fhenry
1fc04d5b5c Add table extrafield for commande fournisseur... 
Seems this module work as separate from order but config is missing. Try
to create a new one.
 2013-04-30 13:56:03 +02:00
BENKE Charles
b1784ff247 Update modSociete.class.php 
add filter feature on extrafields
 2013-04-30 13:15:02 +03:00
BENKE Charles
3f6216e6d0 Update modProduct.class.php 
Add filtering feature on extrafields
 2013-04-30 13:12:54 +03:00
Laurent Destailleur
4a9ed428f0 Fix: isset on scalar value 2013-04-30 09:58:30 +02:00
Laurent Destailleur
f8b4551ef6 Merge pull request #901 from marcosgdf/develop 
Holidays module improvements
 2013-04-29 10:28:47 -07:00
Laurent Destailleur
1e9157603d Merge pull request #900 from defrance69/patch-3 
Update project.class.php
 2013-04-29 10:27:55 -07:00
Laurent Destailleur
9fabf75f14 Merge pull request #898 from defrance69/patch-1 
Update projects.lang
 2013-04-29 10:27:36 -07:00
Laurent Destailleur
4274a1aa21 Merge pull request #897 from grandoc/3.3 
fix some indefined index
 2013-04-29 10:27:25 -07:00
Laurent Destailleur
a9b7e9eaac Merge pull request #899 from defrance69/patch-2 
Update element.php
 2013-04-29 10:27:16 -07:00
Laurent Destailleur
cd6ceaf3f4 Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/holiday/fiche.php
 2013-04-29 19:04:15 +02:00
Marcos García
bf36376215 Corrected ca_ES translations 
Translations made by Juanjo Menent (simnandez)
 2013-04-29 18:05:11 +02:00
Marcos García
da9cbc6e58 Corrected translation key 2013-04-29 18:02:18 +02:00
Marcos García
7dd457d2df Added DurationDays string to the table 2013-04-29 18:01:26 +02:00
Marcos García
8837caeb6f Style improvement 2013-04-29 17:57:24 +02:00
Marcos García
b9429fc98e Fixed a bug when showing users to define holidays 2013-04-29 17:24:02 +02:00
simnandez
fd85755461 Fix: [ bug #855 ] Holiday approval email in French 2013-04-29 12:55:14 +02:00
simnandez
00adb1b9ab Fix: [ bug #855 ] Holiday approval email in French 2013-04-29 12:46:07 +02:00
BENKE Charles
d9363f441a Update project.class.php 
Add feature to add element in elements page of a project
 2013-04-29 13:02:58 +03:00
BENKE Charles
830aff99e4 Update element.php 
add feature: join element from element page
 2013-04-29 12:54:29 +03:00
BENKE Charles
1d68a01298 Update projects.lang 
Add Link element on elements page
 2013-04-29 12:49:03 +03:00
Laurent Destailleur
840dcfec38 Fix: Bad detection of PDF format. 2013-04-29 09:25:42 +02:00
Laurent Destailleur
9bbe5014e6 Fix: Bad field size on old installations 2013-04-28 23:50:40 +02:00
Laurent Destailleur
f6c2bd4928 Fix: Uniformize menu conditions 2013-04-28 23:25:28 +02:00
Grand Philippe
63c474e2cc fix: Undefined index 2013-04-28 22:29:50 +02:00
Laurent Destailleur
ce47a7d731 printSearchForm hook match specifications 2013-04-28 20:53:23 +02:00
Laurent Destailleur
b21a13b789 Fix: compatibility with jmobile 2013-04-28 20:29:21 +02:00
Grand Philippe
c4a064d104 fix: Undefined property: mod_codeclient_monkey::$prefixIsRequired 2013-04-28 19:35:10 +02:00
Laurent Destailleur
670d01e14e Fix: Remove space char at end of document and viewimage. 2013-04-28 18:46:34 +02:00
Laurent Destailleur
27ae971f35 Fix: W3C 2013-04-28 12:46:52 +02:00
Grand Philippe
1d52d50ac1 fix: issue from last commit 2013-04-28 12:17:04 +02:00
Grand Philippe
0661f9f1f8 fix: Assigning the return value of new by reference is deprecated 2013-04-28 10:40:25 +02:00
Grand Philippe
647956576d fix some indefined index 2013-04-28 08:21:46 +02:00
Marcos García
54fc731df7 Fix: [bug #856] Mail error if destination user doesn't have an email 2013-04-28 01:58:57 +02:00
Laurent Destailleur
80e470a4ce Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/compta/facture.php
	htdocs/compta/facture/impayees.php
	htdocs/compta/index.php
	htdocs/core/boxes/box_produits_alerte_stock.php
	htdocs/core/class/html.form.class.php
	htdocs/core/modules/syslog/mod_syslog_file.php
	htdocs/fourn/facture/impayees.php
	htdocs/holiday/class/holiday.class.php
	htdocs/holiday/fiche.php
 2013-04-28 01:24:58 +02:00
Laurent Destailleur
7b85baa5e4 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-04-28 01:12:48 +02:00
Laurent Destailleur
2e81fa342e Uniformize code, order of fiels in card and language files. 2013-04-28 01:12:40 +02:00
Laurent Destailleur
757473cf86 Replace table with div 2013-04-28 00:36:49 +02:00
jfefe
54f0d1b1a5 Fix : use standard method to show extrafields 2013-04-27 22:57:29 +02:00
Laurent Destailleur
de1f53db45 Merge pull request #894 from marcosgdf/holidays-translations 
Holidays translations
 2013-04-27 12:54:16 -07:00
Laurent Destailleur
f8e0f40ffa Merge pull request #891 from marcosgdf/bug-857 
Fix: [ bug #857 ] Invoice created from shipment does not have the order ...
 2013-04-27 12:53:55 -07:00
Laurent Destailleur
4c9a728799 Merge pull request #890 from marcosgdf/translations 
Improved translations
 2013-04-27 12:53:15 -07:00
Laurent Destailleur
ab668f0f07 Merge pull request #892 from marcosgdf/expedition-translations 
Corrected incorrect lang trans key
 2013-04-27 12:51:52 -07:00
Laurent Destailleur
07baa244ed No need to make a test on a var 2013-04-27 21:38:49 +02:00
Laurent Destailleur
38bc86dc2a Missing menu entry for home page 2013-04-27 21:37:30 +02:00
Laurent Destailleur
9dc0a19ed3 More logs 2013-04-27 21:36:52 +02:00
Laurent Destailleur
e4ea3b9b0e Propagation of param missing. 2013-04-27 21:35:30 +02:00