Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-02-11 18:32:32 +01:00
Code Issues Packages Projects Releases Wiki Activity
45,127 Commits 39 Branches 191 Tags
a5572eb200cd0ebcd2b7ecf717d8a0c73887ea9d
Commit Graph

45127 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Drosis Nikos
a5572eb200 Fix Lang for cashdesk Check Payment Type 2015-01-02 18:15:14 +02:00
Laurent Destailleur
baa247ea86 Fixed: doxygen 2014-12-30 21:24:57 +01:00
Laurent Destailleur
d72d056e02 Enhance look for contacts forms of thirdparties. 2014-12-30 21:04:02 +01:00
Laurent Destailleur
8abbac564b Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/filefunc.inc.php
	htdocs/main.inc.php
 2014-12-30 04:28:09 +01:00
Laurent Destailleur
3848daeab8 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	build/debian/changelog
	build/exe/doliwamp/doliwamp.iss
	build/makepack-dolibarr.pl
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
	build/rpm/dolibarr_mandriva.spec
	build/rpm/dolibarr_opensuse.spec
	htdocs/filefunc.inc.php
	htdocs/product/stats/facture.php
 2014-12-30 04:20:50 +01:00
Laurent Destailleur
c7937a9962 Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 3.6.2 2014-12-27 02:22:09 +01:00
Laurent Destailleur
953e736a97 Prepare version 3.6.2 2014-12-27 02:21:37 +01:00
Laurent Destailleur
36f5715e47 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-12-27 01:13:30 +01:00
Laurent Destailleur
613d1b381b Doxygen 2014-12-27 01:10:42 +01:00
Laurent Destailleur
41118a174a Merge pull request #2195 from marcosgdf/bug-1714 
Fix  [ bug #1714 ] Id "sall" is used twice in different HTML tags
 2014-12-26 22:11:37 +01:00
Laurent Destailleur
29db4d4670 Merge pull request #2194 from atm-maxime/develop 
in PDF, no line jump after doc linked ref. Fix bug 1605.
 2014-12-26 22:07:55 +01:00
Laurent Destailleur
0496d81b6a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-12-26 22:04:41 +01:00
Laurent Destailleur
5d80061caf Mark property error as deprecated 2014-12-26 22:04:16 +01:00
Marcos García de La Fuente
9f6f90275a Fix [ bug #1714 ] Id "sall" is used twice in different HTML tags 2014-12-26 12:03:29 +01:00
Maxime Kohlhaas
e7ebb78ffd in PDF, no line jump after doc linked ref. Fix bug 1605. 2014-12-26 11:09:46 +01:00
Juanjo Menent
a901329a7d Fix: Bad order field value 2014-12-26 09:43:55 +01:00
Juanjo Menent
bdf5f5726f Fix: Bad order field value 2014-12-26 09:29:27 +01:00
Juanjo Menent
d40229e9cc Fix: Bad order field value 2014-12-26 09:14:19 +01:00
Laurent Destailleur
d8557d8af0 Fixed: label 2014-12-26 05:16:00 +01:00
Laurent Destailleur
5ead994955 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	ChangeLog
 2014-12-26 04:57:55 +01:00
Laurent Destailleur
657fc1b91c Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	ChangeLog
	htdocs/comm/fiche.php
	htdocs/core/lib/functions2.lib.php
	htdocs/fourn/fiche.php
	htdocs/langs/fr_FR/compta.lang
	htdocs/projet/element.php
	htdocs/projet/tasks/contact.php
	htdocs/projet/tasks/time.php
 2014-12-26 04:44:15 +01:00
Laurent Destailleur
75dbcf4a78 Fixed: doxygen 2014-12-26 04:35:48 +01:00
Laurent Destailleur
d18770c1e7 Merge remote-tracking branch 'origin/3.5' into 3.6 2014-12-26 04:16:08 +01:00
Laurent Destailleur
0e952c67ff Merge pull request #2193 from marcosgdf/bug-1761 
Fix: [ bug #1761 ] SQL error when installing 3.7 with PostgreSQL
 2014-12-26 04:14:03 +01:00
Laurent Destailleur
490b0c5f3a Merge branch 'marcosgdf-bug-1768' into 3.5 2014-12-26 04:13:36 +01:00
Laurent Destailleur
77e48f8c3e Merge branch 'bug-1768' of https://github.com/marcosgdf/dolibarr into marcosgdf-bug-1768 2014-12-26 04:12:58 +01:00
Laurent Destailleur
882fd9a798 Merge branch 'marcosgdf-bug-1757' into 3.5 2014-12-26 04:11:30 +01:00
Laurent Destailleur
38c9d39c2b Merge branch 'bug-1757' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-1757

Conflicts:
	ChangeLog
 2014-12-26 04:11:15 +01:00
Laurent Destailleur
4e2c321e4d Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 
Conflicts:
	ChangeLog
 2014-12-26 04:09:08 +01:00
Laurent Destailleur
83e34a1c4e Merge branch 'marcosgdf-bug-1769' into 3.5 2014-12-26 04:07:53 +01:00
Laurent Destailleur
0da1c2e589 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2014-12-26 04:06:10 +01:00
Laurent Destailleur
420ebe0be9 Fix: Change order to create fields 2014-12-26 04:04:16 +01:00
Laurent Destailleur
3c500158a9 Merge pull request #2187 from marcosgdf/bug-1715 
Fix [ bug #1715 ] Valign and width attributes are used in div tags
 2014-12-26 04:02:46 +01:00
Laurent Destailleur
5215b1e641 Merge pull request #2186 from marcosgdf/bug-575 
Fix [ bug #575 ] GED doesn't works if there is "/" in a mask
 2014-12-26 04:02:01 +01:00
Laurent Destailleur
469aba888a Merge pull request #2184 from marcosgdf/bug-1674 
Fix: [ bug #1674 ] PayPal logo copyright issues
 2014-12-26 03:52:34 +01:00
Laurent Destailleur
bba8653179 Merge pull request #2183 from marcosgdf/bug-1724 
Fix: [ bug #1724 ] Can't add a submenu to projects
 2014-12-26 03:50:36 +01:00
Laurent Destailleur
54437703fb Merge pull request #2177 from frederic34/patch-7 
Enhance select_salesrepresentatives with select2
 2014-12-26 03:49:43 +01:00
Laurent Destailleur
f31bf5d80e Merge pull request #2175 from marcosgdf/bug-1752 
Fix: [ bug #1752 ] Date filter of margins module, filters since 12H instead of 00H
 2014-12-26 03:49:02 +01:00
Laurent Destailleur
ade688b589 Merge pull request #2174 from marcosgdf/bug-1723 
Fix [ bug #1723 ] Draft tasks?
 2014-12-26 03:48:15 +01:00
Laurent Destailleur
b2d27a7d25 Merge pull request #2173 from marcosgdf/translation 
Fixed string not translated in linked objects of a project
 2014-12-26 03:47:56 +01:00
Laurent Destailleur
8d4186f438 Merge pull request #2172 from marcosgdf/bug-1533 
Fix: [ bug #1533 ] Links triggers do not show trigger error message
 2014-12-26 03:47:05 +01:00
Marcos García de La Fuente
745eece5fe Fix: [ bug #1761 ] SQL error when installing 3.7 with PostgreSQL 2014-12-26 00:34:57 +01:00
Marcos García de La Fuente
8e47fe9e1c Fix: [ bug #1757 ] Sorting breaks product/service statistics 2014-12-26 00:19:09 +01:00
Marcos García de La Fuente
1d39c1acc2 Fix: [ bug #1768 ] PHP Warning when error connecting to a PostgreSQL server in install script 2014-12-26 00:12:16 +01:00
Marcos García de La Fuente
f4def9ea28 Fix: [ bug #1769 ] Error when installing to a PostgreSQL DB that contains numbers 2014-12-26 00:07:24 +01:00
Laurent Destailleur
3a7bd794a5 Merge pull request #2181 from frederic34/patch-13 
Update list.php
 2014-12-25 23:26:14 +01:00
Laurent Destailleur
d8783f661c Merge pull request #2180 from frederic34/patch-12 
Add css badge
 2014-12-25 23:25:36 +01:00
Laurent Destailleur
4bbf16e277 Merge pull request #2178 from frederic34/patch-10 
Add css badge
 2014-12-25 23:25:30 +01:00
Laurent Destailleur
f3fded2a0a Merge pull request #2171 from marcosgdf/bug-1649 
Fix: [ bug #1649 ] Cancel button of several thirdparty actions, does the same thing as modify
 2014-12-25 23:25:22 +01:00
Laurent Destailleur
6c67df0698 Merge branch 'marcosgdf-bug-1731' into 3.6 2014-12-25 23:21:55 +01:00