Commit Graph

45252 Commits

Author SHA1 Message Date
Laurent Destailleur
86e04cb62f Enhance tool to fix images 2014-11-30 15:40:28 +01:00
Laurent Destailleur
e395fd8096 Fix CRLF 2014-11-30 15:24:39 +01:00
Ion Agorria
c36f94a9a3 Fixed dinamic typo to dynamic 2014-11-30 15:14:25 +01:00
Laurent Destailleur
d39dbe66c8 Fix: Removed duplicate entrie into language files
Renamed tool so all script to run before release start with "fix".
2014-11-30 14:51:57 +01:00
Laurent Destailleur
01209ff844 Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
	htdocs/product/stock/card.php
2014-11-30 14:15:38 +01:00
Laurent Destailleur
e2c606f416 Better translation 2014-11-30 14:12:59 +01:00
Frédéric FRANCE
18f2cfbeac Fix missing space 2014-11-30 13:28:09 +01:00
Frédéric FRANCE
ca3f4a09f4 Update main.inc.php 2014-11-30 13:07:13 +01:00
Ion Agorria
004d88fe0b Fixed error when creating a price selecting a expression without filling the numeric price 2014-11-30 02:15:16 +01:00
Laurent Destailleur
20e76aa4e6 Fixed: Use constant to hide a feature that will probably be broken. Also
it is a superfluous feature.
2014-11-30 02:05:45 +01:00
Laurent Destailleur
da841e28cd Add warning 2014-11-30 01:39:24 +01:00
Laurent Destailleur
7303983610 Fixed: Ton of old bugs when debugging POS. 2014-11-30 01:35:58 +01:00
Laurent Destailleur
7843ed41f3 Fixed: Bad permission 2014-11-29 20:50:05 +01:00
Laurent Destailleur
def4ab5065 Fixed: Missing picto
Fixed: Menu auguria
Fixed: Default label
2014-11-29 20:41:09 +01:00
Laurent Destailleur
b9ea7d4d13 Fix: Stock decrease from POS 2014-11-29 17:38:12 +01:00
Laurent Destailleur
1797569a6d Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2014-11-29 16:44:37 +01:00
Laurent Destailleur
3fe2db6c8d Try to find a solution to fight against spam sending from dolibarr when
phpmail is set.
No time to find a better solution so i add just a hidden option to
disable phpmail function.
2014-11-29 13:50:41 +01:00
Laurent Destailleur
278cdf72d6 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2014-11-29 12:41:26 +01:00
Laurent Destailleur
c7420662e6 Fixed: Module for target emailing must not be visible when modules is
disabled.
2014-11-29 12:40:45 +01:00
Laurent Destailleur
06df952e57 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-11-29 12:40:20 +01:00
Laurent Destailleur
0a7255ccc1 Fixed: Module for target emailing must not be visible when modules is
disabled.
2014-11-29 12:38:36 +01:00
Laurent Destailleur
e118d9af22 Fixed: Protection to lock language setup in demo mode was not working 2014-11-29 12:11:12 +01:00
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