Laurent Destailleur
|
d211f8f971
|
Merge pull request #2126 from frederic34/patch-15
Update main.inc.php
|
2014-12-03 12:18:50 +01:00 |
|
Laurent Destailleur
|
a25b86d03b
|
Merge pull request #2129 from defrance69/patch-31
Update supplierinvoice_extrafields.php
|
2014-12-03 12:17:18 +01:00 |
|
Laurent Destailleur
|
d87b3ba614
|
Merge pull request #2115 from frederic34/patch-5
Add EditorConfig see http://editorconfig.org/
|
2014-12-02 19:57:15 +01:00 |
|
Laurent Destailleur
|
a796fea1c8
|
Merge pull request #2114 from frederic34/patch-4
Fix mix of space and nbsp
|
2014-12-02 19:56:04 +01:00 |
|
Laurent Destailleur
|
c8e1c2bff4
|
Merge pull request #2113 from frederic34/patch-3
Fix missing /form
|
2014-12-02 19:54:46 +01:00 |
|
Laurent Destailleur
|
58b8f5b3a5
|
Merge pull request #2125 from frederic34/patch-14
Fix replace </td> by </th>
|
2014-12-02 19:52:11 +01:00 |
|
Laurent Destailleur
|
758bbb27db
|
Merge pull request #2127 from frederic34/patch-16
Fix Typo
|
2014-12-02 19:50:56 +01:00 |
|
Laurent Destailleur
|
7868d286d3
|
Update debian tuto
|
2014-12-02 14:42:21 +01:00 |
|
BENKE Charles
|
3c12d5f420
|
Update supplierinvoice_extrafields.php
add orders translation files for correct menu translation error
|
2014-12-02 10:36:48 +01:00 |
|
Laurent Destailleur
|
da6f3a692b
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2014-12-01 01:11:42 +01:00 |
|
Laurent Destailleur
|
2db6258cb7
|
Fixed: Button at wrong place
|
2014-12-01 00:52:38 +01:00 |
|
Frédéric FRANCE
|
3e3dbb1280
|
Update main.inc.php
|
2014-11-30 23:53:51 +01:00 |
|
Frédéric FRANCE
|
d0c9b6e9ef
|
Fix Typo
|
2014-11-30 23:23:30 +01:00 |
|
Frédéric FRANCE
|
b3418b92a3
|
Update main.inc.php
|
2014-11-30 23:05:30 +01:00 |
|
Frédéric FRANCE
|
222c275378
|
Update index.php
|
2014-11-30 23:04:01 +01:00 |
|
Laurent Destailleur
|
ef4bdcdb2a
|
Merge remote-tracking branch 'origin/3.7' into develop
|
2014-11-30 15:43:04 +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
|
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 |
|
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
|
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 |
|
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 |
|
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 |
|
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 |
|
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
|
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 |
|