Commit Graph

44546 Commits

Author SHA1 Message Date
Laurent Destailleur
cf646b914d Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2014-11-30 18:57:52 +01:00
Laurent Destailleur
931c1fc671 Sync from transifex 2014-11-30 16:20:58 +01:00
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
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
e2c606f416 Better translation 2014-11-30 14:12:59 +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
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
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
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
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
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
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
491aef72e0 More phpunit tests 2014-11-28 00:56:21 +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
Laurent Destailleur
3af6e048e5 Merge pull request #2101 from frederic34/patch-8
Fix remove </a> not needed
2014-11-27 23:59:05 +01:00
Laurent Destailleur
f36a30f9fe Fixed: W3C. An id must be unique inside a page. 2014-11-27 23:25:29 +01:00
Frédéric FRANCE
5a97ee1f95 Rearrange Help Block in left menu 2014-11-27 23:20:13 +01:00
Laurent Destailleur
8d33a6947b Merge pull request #2105 from frederic34/patch-11
Fix 1733 Homepage boxes close button translation error
2014-11-27 21:51:00 +01:00
Laurent Destailleur
8a8f9aaee3 Merge pull request #2106 from frederic34/patch-12
Fix 1655 Proposal amount not computed in preview
2014-11-27 21:49:43 +01:00
Frédéric FRANCE
f769295999 Update apercu.php 2014-11-27 21:03:01 +01:00
Laurent Destailleur
9088ca943b Merge pull request #2110 from aternatik/fix_ws_3.7
Missing extrafields management for order webservice
2014-11-27 13:56:40 +01:00
jfefe
1b35c5e77b Missing extrafields management for order webservice 2014-11-27 12:56:10 +01:00
Frédéric FRANCE
e179e7d5a5 Fix 1655 Proposal amount not computed in preview 2014-11-26 17:24:26 +01:00
Frédéric FRANCE
90b582b1f3 Fix 1733 Homepage boxes close button translation error
In french : Close -> Clotûrer (Close a propal)
Close2 ->Fermer (Close a window)
2014-11-26 16:58:54 +01:00
Francis Appels
b1a4b8e7d0 Fix: [ bug #1624 ] POS set buy price for margin
Use lowest buying price for margin when selling with POS or external
module. A POS user does not worry about suppliers.
2014-11-25 21:20:13 +01:00