2
0
forked from Wavyzz/dolibarr
Commit Graph

9302 Commits

Author SHA1 Message Date
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
6843bfcc15 Fix typo 2014-11-28 00:01:59 +01:00
Laurent Destailleur
d9cb9c1585 Merge pull request #2102 from aspangaro/develop-center
Task 1603 - Remove <center> deprecated HTML5 tags
2014-11-27 23:58:44 +01:00
Laurent Destailleur
60e5369db2 Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
	htdocs/bookmarks/card.php
2014-11-27 22:01:02 +01:00
aspangaro
b98c0a3208 Login - Better presentation with RWD 2014-11-27 20:32:29 +01:00
Philippe GRAND
217cacbc29 To avoid over wrighting lines 2014-11-27 17:26:06 +01:00
aspangaro
21f14320cf Untranslatable token in datepicker 2014-11-27 05:07:04 +01:00
Frédéric FRANCE
2ee55a39fd Update ecm.lib.php 2014-11-26 18:35:16 +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
aspangaro
38d94bac33 Correct login page 2014-11-25 21:47:08 +01:00
aspangaro
559bf93acb Correct 2014-11-25 20:40:00 +01:00
aspangaro
c4c69e191b Replace <center> tags 2014-11-25 20:13:43 +01:00
Francis Appels
18406fc550 Fix: Show sender Country on PDF docs
Show sender Country on PDF docs when sender Country != receiver Country
2014-11-25 14:26:45 +01:00
Frédéric FRANCE
911f9c0913 Fix Typo 2014-11-25 01:13:52 +01:00
Frédéric FRANCE
e4517ee0f4 Fix Typo 2014-11-25 01:07:45 +01:00
Frédéric FRANCE
9fb58e06f6 Fix Typo 2014-11-25 01:06:55 +01:00
Frédéric FRANCE
6163635d7c Fix Typo 2014-11-25 01:06:04 +01:00
Frédéric FRANCE
9d813b25d9 Fix Typo 2014-11-25 01:05:01 +01:00
Laurent Destailleur
1dbb19e8ef Merge pull request #2058 from defrance69/patch-30
Update objectline_create.tpl.php
2014-11-24 10:57:14 +01:00
Laurent Destailleur
ca1a21012e Merge pull request #2086 from aspangaro/3.7-patch1
Patch module resource
2014-11-24 00:58:41 +01:00
Laurent Destailleur
7a18240d2f Doxygen 2014-11-23 23:22:49 +01:00
aspangaro
aa8c165f06 Presentation 2014-11-23 21:03:34 +01:00
Marcos García de La Fuente
a927a04421 Fixed [ bug #1705 ] Members statistics menu entry strange target 2014-11-23 16:55:32 +01:00
Laurent Destailleur
9c107790e4 Merge pull request #2079 from marcosgdf/bug-1705
Fixed [ bug #1705 ] Members statistics menu entry strange target
2014-11-23 16:53:54 +01:00
Laurent Destailleur
245a06d433 Merge remote-tracking branch 'origin/3.7' into develop 2014-11-23 16:52:15 +01:00
Marcos García de La Fuente
bd765ef3ae Fixed [ bug #1705 ] Members statistics menu entry strange target 2014-11-23 16:17:09 +01:00
Marcos García de La Fuente
9f73277ef2 Fixed [ bug #1642 ]: add a free line in contract 2014-11-23 13:14:54 +01:00
Laurent Destailleur
97a6bd842d Minor fixes. 2014-11-23 12:39:53 +01:00
Laurent Destailleur
2a56a19b7d Merge remote-tracking branch 'origin/3.7' into develop 2014-11-22 16:59:12 +01:00
Laurent Destailleur
671243e8f6 Fixed: Bugs reported by scrutinizer
Fixed: Solve conflict between ->iban and ->iban_prefix.
2014-11-22 16:57:08 +01:00
Laurent Destailleur
02e18bc03d Merge remote-tracking branch 'origin/3.7' into develop 2014-11-22 16:29:06 +01:00
Laurent Destailleur
8b545af325 Merge pull request #1982 from atm-alexis/feature_agenda_files_on_card_view
add files view into agenda card
2014-11-22 16:24:09 +01:00
Laurent Destailleur
d8767bfbae Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/product/class/product.class.php
2014-11-22 16:10:14 +01:00
Laurent Destailleur
9aab62ab36 Merge remote-tracking branch 'origin/3.5' into 3.6 2014-11-22 16:03:09 +01:00
Laurent Destailleur
2f4de2ef75 Merge pull request #2016 from altatof/3.5
FIX: copy extrafields when creating order from propale and creating
2014-11-22 16:02:13 +01:00
BENKE Charles
730bf1c25c Update html.formcontract.class.php
bad filtering on contract list (same sql rule as project)
2014-11-22 15:41:18 +01:00
Laurent Destailleur
f845cde3f1 Merge pull request #2056 from defrance69/patch-29
bad filtering on contract list (same sql rule as project)
2014-11-22 15:40:41 +01:00
Laurent Destailleur
b644075faa Fix: doxygen 2014-11-20 23:41:58 +01:00
Laurent Destailleur
f7a74a9ac9 Fix: CRLF 2014-11-20 16:16:15 +01:00
Laurent Destailleur
95de38e102 Start to fix [ bug #1711 ] Projet cloturé toujours visible dans les
autres module pour affectation but it is a too important change.
2014-11-20 15:32:10 +01:00
Laurent Destailleur
d462facf6d Fixed: [ bug #1653 ] Can't access task notes 2014-11-20 14:44:49 +01:00
Laurent Destailleur
ea02bdf85e Fix: duplicate function 2014-11-20 13:06:05 +01:00
BENKE Charles
fdac53bfca Update objectline_create.tpl.php
add label tags for product mode type
2014-11-19 18:53:33 +01:00
Juanjo Menent
9e28452379 Fix: remove duplicate code 2014-11-19 10:02:01 +01:00
Juanjo Menent
3dacdf4e4a Fix: Conflicts and remove duplicate code 2014-11-19 09:41:21 +01:00
BENKE Charles
44f3e64df2 Update html.formcontract.class.php
bad filtering on contract list (same sql rule as project)
2014-11-19 09:28:11 +01:00
Laurent Destailleur
8b0a9d78bb Fix: CRLF 2014-11-18 19:03:02 +01:00
Laurent Destailleur
31f987706c Fix: bugs reported by scrutinizer 2014-11-17 15:13:23 +01:00
Christophe Battarel
d0dc792b3c check extrafields before inserting in DB 2014-11-17 11:17:45 +01:00