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

32208 Commits

Author SHA1 Message Date
Laurent Destailleur
b3bdc76da3 Trans: More complete examples 2013-06-26 00:05:00 +02:00
Laurent Destailleur
8359a34545 Merge remote-tracking branch 'origin/3.3' into 3.4 
Conflicts:
	ChangeLog
	build/debian/changelog
	build/exe/doliwamp/doliwamp.iss
	build/makepack-dolibarr.pl
	build/perl/virtualmin/dolibarr.pl
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
	build/rpm/dolibarr_mandriva.spec
	build/rpm/dolibarr_opensuse.spec
	htdocs/compta/facture/class/facture-rec.class.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/filefunc.inc.php
 2013-06-25 21:31:24 +02:00
Laurent Destailleur
2af8f295b1 Fix: warning not always visible. Depends if addon modules were 
installed. Var should provide a quick fix.
 2013-06-25 21:25:09 +02:00
Laurent Destailleur
187feff7d5 Prepare 3.3.3 2013-06-25 20:40:22 +02:00
Laurent Destailleur
0ec4b3bcdb Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4 2013-06-25 18:10:55 +02:00
Laurent Destailleur
285ea8da3f More info into log 2013-06-25 15:47:59 +02:00
jfefe
54bf3fd516 Add parameter to force user in dol_check_access_document function 
This required by webservice where global $user is not available
 2013-06-25 15:09:51 +02:00
Laurent Destailleur
c2654fa7e2 Fix: Bad translation. Must use a different string than products 2013-06-25 15:00:10 +02:00
simnandez
065b30f0d0 [Bug #958] LocalTax2 for Spain fails on Suppliers 2013-06-25 11:12:21 +02:00
Laurent Destailleur
7f3a06127a Fix: Bad regex 2013-06-24 19:55:23 +02:00
Laurent Destailleur
eb07c6b2e7 Fix: Missing left padding 2013-06-24 19:45:29 +02:00
Laurent Destailleur
8d04f5a805 Fix: warning 2013-06-24 19:36:10 +02:00
Regis Houssin
307ae65924 Fix: crlf to lf for avoid errors with git clone 2013-06-24 17:43:27 +02:00
Regis Houssin
05bd035488 Fix: convert line delimiters 2013-06-24 17:34:22 +02:00
Regis Houssin
cb9dcfa369 Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-06-24 17:13:39 +02:00
Regis Houssin
aa7e61178a New: add product price sharing for multicompany 2013-06-24 17:13:08 +02:00
Laurent Destailleur
7fb8a740e7 Fix: bad function 2013-06-23 18:54:18 +02:00
Laurent Destailleur
7bfdec7993 Fix: css 2013-06-23 18:53:40 +02:00
Laurent Destailleur
3662638064 Fix: Css for fieldset 2013-06-23 14:37:09 +02:00
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