Commit Graph

46411 Commits

Author SHA1 Message Date
Laurent Destailleur
cdd256e206 Add info to help understand debug 2014-11-29 12:00:42 +01:00
aspangaro
3db2e46fc6 Typo 2014-11-29 07:41:51 +01:00
aspangaro
30bff7ef28 Need to enable MAIN_ACTIVATE_HTML5 to insert meta balise viewport 2014-11-29 07:12:12 +01:00
aspangaro
c27e2676e3 Modify presentation of login page 2014-11-29 07:08:35 +01:00
aspangaro
64260cde72 Add button in admin->GUISetup to activate Html5 2014-11-29 07:07:27 +01:00
Ion Agorria
4ce8719d98 Fix lang typo 2014-11-29 06:37:49 +01:00
Ion Agorria
6c37d03f13 Added language entries for dinamic prices 2014-11-29 06:32:33 +01:00
Ion Agorria
0fafe3f7d2 Required SQL changes for dinamic prices 2014-11-29 06:31:54 +01:00
Ion Agorria
fac46b3b46 Code for dinamic prices funcionality 2014-11-29 06:31:35 +01:00
Ion Agorria
48e1f4ec55 Library for evaluating math expresions 2014-11-29 06:30:26 +01:00
Laurent Destailleur
7f0a01936e Fix a very old bug of conflicth into decrease stock when using point of
sale, not compatible with option defined into stock module.
2014-11-28 20:41:52 +01:00
Laurent Destailleur
d3b32ce22f Fixed: Bad function/picto for information messages (not a star) 2014-11-28 19:49:42 +01:00
Raphaël Doursenaud
10456f90d9 Language files should not be executable 2014-11-28 16:06:45 +01:00
Raphaël Doursenaud
0bd295dca7 Transifex: added missing language files to the configuration 2014-11-28 16:05:25 +01:00
Raphaël Doursenaud
92b54fd496 Removed deprecated oscommerce language files
Note to transifex sync personnel: you may have to manually remove the file
from Transifex to prevent it from coming back!
2014-11-28 16:03:45 +01:00
Raphaël Doursenaud
732f235c06 Transifex: removed forgotten oscommerce language files 2014-11-28 15:59:29 +01:00
Raphaël Doursenaud
953fe6b1f2 CRLF fix 2014-11-28 15:58:23 +01:00
Frédéric FRANCE
75e61a023f Add EditorConfig see http://editorconfig.org/
Feel free to add the plugin to your favorite editor (if exists)
2014-11-28 15:58:04 +01:00
Philippe GRAND
d156e1ba82 form should be outside table 2014-11-28 12:51:08 +01:00
Philippe GRAND
15311fb643 form should not be inside table 2014-11-28 12:41:53 +01:00
Philippe GRAND
c3d66b037d Revert "add default payment mode select"
This reverts commit 917423dc0c.
2014-11-28 10:35:02 +01:00
Frédéric FRANCE
369f802112 Fix mix of space and nbsp 2014-11-28 08:50:37 +01:00
Frédéric FRANCE
bff209a895 Fix missing /form 2014-11-28 08:25:51 +01:00
aspangaro
1c89186652 Merge remote-tracking branch 'Upstream/develop' into develop-html5 2014-11-28 06:20:01 +01:00
Laurent Destailleur
a724c3aa70 Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
	htdocs/main.inc.php
2014-11-28 02:26:40 +01:00
Laurent Destailleur
df9a6dae6c Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/fichinter/fiche.php
2014-11-28 02:20:01 +01:00
Laurent Destailleur
a81c483061 Revert "Update objectline_create.tpl.php"
This reverts commit fdac53bfca.
2014-11-28 02:14:25 +01:00
Laurent Destailleur
9ba5e9434d Fix: W3C a label must be used if there is an "input" field only. Also it
is recommanded to have the input inside the label tags, not outside.
This solve bugs on some smatphone browsers.
2014-11-28 02:05:40 +01:00
Laurent Destailleur
06894a196c Merge pull request #2112 from frederic34/patch-2
Put form outside table
2014-11-28 01:18:54 +01:00
Marcos García de La Fuente
1c16a2e621 Fixed [ bug #1642 ]: add a free line in contract 2014-11-28 01:15:45 +01:00
Laurent Destailleur
44b81ad29c Merge pull request #2074 from marcosgdf/bug-1642
Fixed [ bug #1642 ]: add a free line in contract
2014-11-28 01:14:23 +01:00
Laurent Destailleur
79c8980493 Fix: function at wrong place 2014-11-28 01:13:57 +01:00
Marcos García de La Fuente
5cc015268e Fixed [ bug #1718 ] Mistakenly searching for text in amount field breaks 2014-11-28 01:02:59 +01:00
Marcos García de La Fuente
0a0e0e068c Fixed [ bug #1691 ] Don't think the ID should be displayed in holiday module 2014-11-28 01:02:44 +01:00
Laurent Destailleur
bca0ccb4e3 Merge pull request #2088 from marcosgdf/bug-1691
Fixed [ bug #1691 ] Don't think the ID should be displayed in holiday module
2014-11-28 01:01:52 +01:00
Frédéric FRANCE
523afc3943 Put form outside table 2014-11-28 00:57:40 +01:00
Laurent Destailleur
491aef72e0 More phpunit tests 2014-11-28 00:56:21 +01:00
Laurent Destailleur
806719b562 Merge pull request #2089 from marcosgdf/bug-1718
Fixed [ bug #1718 ] Mistakenly searching for text in amount field breaks
2014-11-28 00:37:56 +01:00
Laurent Destailleur
38062177d3 Doxygen 2014-11-28 00:37:46 +01:00
Laurent Destailleur
232921a506 Fixed: Add option on a not common new feature 2014-11-28 00:34:03 +01:00
Laurent Destailleur
dc1c98734e Fixed: Option specific to a module should start with module name 2014-11-28 00:21:52 +01:00
Laurent Destailleur
f9953d52f6 Merge pull request #2091 from frederic34/patch-3
Fix 1721 Missing translation on proposal creation
2014-11-28 00:16:44 +01:00
Laurent Destailleur
ae6f458a98 Merge pull request #2092 from frederic34/patch-2
Fix Typo
2014-11-28 00:12:11 +01:00
Laurent Destailleur
02d53aa26f Merge pull request #2093 from frederic34/patch-4
Fix Typo
2014-11-28 00:11:49 +01:00
Laurent Destailleur
b21171303a Merge pull request #2094 from frederic34/patch-5
Fix Typo
2014-11-28 00:11:23 +01:00
Laurent Destailleur
631a98c322 Merge pull request #2095 from frederic34/patch-6
Fix Typo
2014-11-28 00:10:48 +01:00
Laurent Destailleur
61889d2195 Merge pull request #2096 from frederic34/patch-7
Fix Typo
2014-11-28 00:10:24 +01:00
Laurent Destailleur
4be9730518 Merge pull request #2099 from fappels/3.6
Fix: Show sender Country on PDF docs
2014-11-28 00:08:41 +01:00
Laurent Destailleur
db5fb1ad9e Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2014-11-28 00:05:02 +01:00
Laurent Destailleur
6843bfcc15 Fix typo 2014-11-28 00:01:59 +01:00