lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
37,867 Commits 43 Branches 150 Tags 886 MiB
95ea3a01df
Commit Graph

37867 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
c0b4ff3616 Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-06-19 19:54:00 +02:00
Laurent Destailleur
aaad4d3474 Fix: Menu cheque depends on bank module and not invoice. 2013-06-19 19:52:20 +02:00
Laurent Destailleur
9f39671886 Fix: Bad translation 2013-06-19 19:40:19 +02:00
Laurent Destailleur
5667fceba8 Merge pull request #1061 from GPCsolutions/group_concat 
Added group_concat equivalent to PgSQL
 2013-06-19 09:34:38 -07:00
Laurent Destailleur
ad49f965d5 Merge pull request #1060 from FHenry/3.3 
Fix trad holidays module
 2013-06-19 09:34:10 -07:00
Laurent Destailleur
d6d7665e65 Merge pull request #1059 from marcosgdf/translations 
Fixed es_ES translation typo
 2013-06-19 09:34:03 -07:00
Laurent Destailleur
9518cb7836 Merge pull request #1058 from marcosgdf/bug-947 
Fix: [ bug #947 ] Can't create proposal lines with unit price = 0
 2013-06-19 09:33:44 -07:00
Laurent Destailleur
374718f735 Merge pull request #1056 from FHenry/dev_projecthtmlform 
Continue normalizing project html.formprojet.class.php
 2013-06-19 09:32:35 -07:00
Laurent Destailleur
2a014f8c7c Merge pull request #1057 from marcosgdf/develop 
CR Fix
 2013-06-19 09:31:28 -07:00
Laurent Destailleur
6779724dc0 Merge pull request #1055 from FHenry/3.4 
Fix ODT to PDF exec scripts path
 2013-06-19 09:30:11 -07:00
Laurent Destailleur
bcc9b81bab Merge pull request #1052 from PaulPoulain/943 
T943: Put the total of the price at the bottom of the propal list
 2013-06-19 09:29:29 -07:00
Laurent Destailleur
b5f4c45cf0 Merge remote-tracking branch 'origin/3.4' into develop 2013-06-19 18:14:19 +02:00
Laurent Destailleur
09317e2034 Fix: Pb with firstname/lastname and font size 2013-06-19 18:12:05 +02:00
Laurent Destailleur
0b53f72779 Fix: Pb with firstname/lastname and font size 2013-06-19 18:08:05 +02:00
Laurent Destailleur
5cb2ba3909 Several fixes in CSS 
Conflicts:
	htdocs/core/menus/standard/empty.php
 2013-06-19 17:02:09 +02:00
Laurent Destailleur
e92e6f7131 Fix: Icon of wrong version 2013-06-19 17:00:11 +02:00
Laurent Destailleur
9bd41e94b5 Fix: Pb in css 2013-06-19 17:00:01 +02:00
Laurent Destailleur
850ee5e195 Several fixes in CSS 2013-06-19 16:59:03 +02:00
Laurent Destailleur
8dd34c194e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-06-19 16:51:32 +02:00
Laurent Destailleur
8b25a5cbf5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-06-19 16:48:57 +02:00
Laurent Destailleur
5ee3d67488 Fix: Icon of wrong version 2013-06-19 16:44:04 +02:00
Raphaël Doursenaud
2f8954acb3 Added group_concat equivalent to PgSQL 2013-06-19 15:54:27 +02:00
Laurent Destailleur
51d40b94cc Fix: Pb in css 2013-06-19 15:52:06 +02:00
Florian Henry
035edc12ce Fix [ bug #945 ] error adding a service 2013-06-19 14:41:18 +02:00
Laurent Destailleur
d32b36ce29 Fix: css with jmobile 2013-06-19 14:04:25 +02:00
Laurent Destailleur
dcaaa84ddb Fix: css with jmobile 2013-06-19 14:03:54 +02:00
Florian Henry
835b8e9d7e Fix trad holidays 2013-06-19 11:23:43 +02:00
Florian Henry
ee1e266774 Fix trad holidays module 2013-06-19 11:22:53 +02:00
Marcos García
76d9ba6a43 Fixed es_ES translation typo 2013-06-19 10:24:24 +02:00
Marcos García
676191c1f9 Fix: [ bug #947 ] Can't create proposal lines with unit price = 0 2013-06-19 10:22:46 +02:00
Florian Henry
08e0e8244a Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4 2013-06-19 10:07:32 +02:00
Marcos García
4532399026 CR Fix 
I'm getting tired of these commits...
 2013-06-19 09:26:20 +02:00
Laurent Destailleur
965b173451 Fix: hooks for leftmenu must not be loaded if left menu hidden, also 
hooks were lost into page search_page.
 2013-06-19 00:12:35 +02:00
Laurent Destailleur
bd8271ee24 Fix: hooks for leftmenu must not be loaded if left menu hidden, also 
hooks were lost into page search_page.
 2013-06-19 00:11:42 +02:00
Laurent Destailleur
f0aac521d0 Fix: civility label 2013-06-18 23:28:55 +02:00
Laurent Destailleur
66e0f80aa2 Fix: civility label 2013-06-18 23:28:03 +02:00
Laurent Destailleur
8f60d60e8d Fix: Bad return url 2013-06-18 22:12:49 +02:00
Laurent Destailleur
73e3ef3a82 Fix: Bad return url 2013-06-18 22:12:17 +02:00
Laurent Destailleur
c45cd3aa1c Fix: Tab must not always be visible 2013-06-18 21:44:18 +02:00
lalaina rasamoelina
e8f26ad33b T943 If there is only one page, we keep label "Total HT", but if there is more than one page, we use "Total HT for this page" 2013-06-18 10:59:19 +02:00
Laurent Destailleur
71b61fc1f5 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/core/class/html.formfile.class.php
	htdocs/langs/fr_FR/mails.lang
	htdocs/user/logout.php
 2013-06-18 09:51:37 +02:00
Florian Henry
cac7cbebd4 Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4 2013-06-18 09:46:49 +02:00
Florian Henry
dc5db0c137 fix ODT to PDF script path 2013-06-18 09:07:53 +02:00
Laurent Destailleur
e8e710fd0c Fix: Translation 2013-06-17 23:53:03 +02:00
Laurent Destailleur
562fa43d9d Fix: Message is not clear enough. 
Fix: Var was not initialized.
 2013-06-17 23:24:53 +02:00
Laurent Destailleur
f0c8c1805f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-06-17 22:11:24 +02:00
Laurent Destailleur
9becf83d70 Keep zapfdingbats. 2013-06-17 22:10:44 +02:00
Florian Henry
83116b5627 Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4 2013-06-17 16:23:54 +02:00
Laurent Destailleur
326387ab75 Fix: Missing lang 2013-06-17 15:00:40 +02:00
Laurent Destailleur
8b73b2b4f3 Fix: Solve some problem of redirect when logout 
Conflicts:
	htdocs/user/logout.php
 2013-06-17 14:54:44 +02:00