Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-07 10:08:27 +01:00
Code Issues Packages Projects Releases Wiki Activity
41,866 Commits 36 Branches 190 Tags
4b9d1b901bccd39b6cd8967ae13b84f8221b0e00
Commit Graph

811 Commits

Author SHA1 Message Date
Florian HENRY
fb277bbbab fix llx_societe.datea call in request 2014-05-13 19:32:04 +02:00
Laurent Destailleur
f95c87f1d6 Fix: [ bug #1374 ] Salaries module requires "Special costs" module to 
work but it does not enable it
 2014-05-10 18:57:04 +02:00
Raphaël Doursenaud
f8f502d013 Removed closing php tag 
http://php.net/manual/en/language.basic-syntax.phptags.php
 2014-05-03 18:18:44 +02:00
Laurent Destailleur
19d71ffb38 Prepare fix to hide images generated by "preview" feature. 2014-04-29 21:14:55 +02:00
Laurent Destailleur
7ac193bb80 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/core/lib/company.lib.php
	htdocs/opensurvey/public/choix_autre.php
 2014-04-02 11:41:55 +02:00
Laurent Destailleur
46e46507ec Merge remote-tracking branch 'origin/3.4' into 3.5 
Conflicts:
	htdocs/comm/action/index.php
	htdocs/compta/bank/class/account.class.php
	htdocs/compta/bank/index.php
 2014-04-02 11:33:47 +02:00
Laurent Destailleur
b675b9b610 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/comm/action/fiche.php
	htdocs/core/class/conf.class.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/company.lib.php
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/fourn/facture/fiche.php
	htdocs/langs/en_US/admin.lang
	htdocs/margin/agentMargins.php
	htdocs/margin/customerMargins.php
	htdocs/margin/productMargins.php
	htdocs/projet/tasks/task.php
 2014-03-31 00:44:45 +02:00
Laurent Destailleur
f282ffc549 Merge pull request #1508 from KreizIT/3.5 
FIX :[bug #1309]
 2014-03-27 15:58:13 +01:00
Florian Henry
3d12979b3f remove debug string 2014-03-26 09:53:48 +01:00
Cedric
57cf384617 Keep value on validtions failure 2014-03-25 13:05:29 +01:00
Cedric
e16385b496 FIX :[bug #1309] 2014-03-25 11:48:44 +01:00
Marcos García de La Fuente
c8c77dbdcf Fix: Agenda and Banks module were not working with multicompany module 2014-03-22 18:59:48 +01:00
jfefe
f648f85b61 Remove debug infos into agenda index 2014-03-15 15:44:02 +01:00
Laurent Destailleur
bdb2b7a547 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/projet/index.php
	test/phpunit/FunctionsTest.php
 2014-03-13 09:20:05 +01:00
Laurent Destailleur
86ad05c22e Merge pull request #1461 from marcosgdf/unknown-error 
Corrected Unknown error message typo
 2014-03-11 11:54:08 +01:00
Marcos García de La Fuente
fa56fe4e8b Corrected Unknown error message typo 2014-03-10 19:36:32 +01:00
philippe
e2b29bb108 fix english misspelling 2014-03-05 09:57:36 +01:00
Laurent Destailleur
24b0ea6613 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	build/makepack-dolibarr.pl
	htdocs/comm/propal.php
	htdocs/compta/facture.php
	htdocs/fourn/class/fournisseur.commande.class.php
 2014-03-03 19:38:02 +01:00
Laurent Destailleur
45898a989c Fix: Translation done twice 2014-03-01 10:16:03 +01:00
simnandez
afebf86bf1 Fix: Loading actions extrafields fails. 
Conflicts:
	htdocs/comm/action/fiche.php
 2014-02-26 16:55:42 +01:00
simnandez
8ffa11fe16 Fix: Loading actions extrafields fails. 2014-02-26 16:50:38 +01:00
Laurent Destailleur
908c39098d Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/comm/action/fiche.php
 2014-02-16 19:47:51 +01:00
Laurent Destailleur
4b8d39af9d Fix: Do not report trigger errors twice. 
Fix: Error when creating event was not reported.

Conflicts:
	htdocs/comm/action/fiche.php
 2014-02-14 13:05:04 +01:00
Laurent Destailleur
3e3c541e4c Fix: Do not report trigger errors twice. 
Fix: Error when creating event was not reported.
 2014-02-14 12:54:04 +01:00
Laurent Destailleur
46e9b5d550 Merge branch 'develop' of https://github.com/grandoc/dolibarr into 
grandoc-develop

Conflicts:
	htdocs/langs/ar_SA/admin.lang
	htdocs/langs/el_GR/admin.lang
	htdocs/langs/es_ES/admin.lang
	htdocs/langs/nl_NL/admin.lang
	htdocs/langs/tr_TR/admin.lang
 2014-02-10 01:30:48 +01:00
Laurent Destailleur
ce8d13ead0 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	ChangeLog
	build/debian/changelog
	build/doxygen/dolibarr-doxygen.doxyfile
	build/exe/doliwamp/doliwamp.iss
	build/makepack-dolibarr.pl
	build/perl/virtualmin/dolibarr.pl
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
	build/rpm/dolibarr_mandriva.spec
	build/rpm/dolibarr_opensuse.spec
	htdocs/comm/action/fiche.php
	htdocs/filefunc.inc.php
	htdocs/install/check.php
 2014-02-10 00:38:10 +01:00
Laurent Destailleur
b750e98d40 Fix: Pb of file upload and download. 2014-02-08 02:02:01 +01:00
Laurent Destailleur
d1951393c7 Fix: priority is a field smallint. 
Conflicts:
	htdocs/comm/action/fiche.php
 2014-02-06 17:09:41 +01:00
Laurent Destailleur
9166dc2d8c Fix: priority is a field smallint. 2014-02-06 16:57:45 +01:00
Laurent Destailleur
d8b8f8c646 Uniformize code for contacts forms. 2014-02-04 20:49:07 +01:00
Laurent Destailleur
1b88ab2355 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/contact/class/contact.class.php
 2014-01-31 10:12:41 +01:00
Laurent Destailleur
d6c4fa5fe3 Qual: Normalize code 2014-01-30 00:40:00 +01:00
Laurent Destailleur
f83b47be9f Fix: Missing loading lang files. 2014-01-26 18:43:30 +01:00
Laurent Destailleur
8d916215cc New: Add new hook function addMoreActionsButtons to allow a module to 
add/replace action buttons into an element.
 2014-01-24 12:51:01 +01:00
Laurent Destailleur
9341db3e86 Fix: Missing id 2014-01-22 03:20:18 +01:00
Laurent Destailleur
63ecb859d6 Fix: Missing alias befofe field into sql request and removed bad join on 
table making some record to disappear.
 2014-01-08 20:50:04 +01:00
Laurent Destailleur
2bc579324d Fix: Opening agenda for a specific day 
Fix: No picto of thirdparty of contact if link is broken
 2013-12-20 13:51:59 +01:00
Laurent Destailleur
ef2f8ea67d Removed some FIXME 2013-12-15 14:26:27 +01:00
Laurent Destailleur
88ae0a7945 Fix: the rename function is bugged with some windows. I add a 
workaround.
Fix: Add also a workaround for [ bug 1064 ] Date/Time in ICS incorrect.
 2013-11-28 12:58:02 +01:00
Laurent Destailleur
e45406694b Fix: no filter is value is '' 2013-11-23 19:28:41 +01:00
Raphaël Doursenaud
594781ec62 Codestyle 2013-11-08 15:31:22 +01:00
Raphaël Doursenaud
d5ab0723ba Timestamp is not a type 
Timestamps are integers so let's document this correctly
 2013-11-07 21:47:13 +01:00
Raphaël Doursenaud
74f83b235a Typecasting 
The GETPOST method returns string, let's make the typecast explicit.
 2013-11-07 21:05:39 +01:00
Raphaël Doursenaud
9e0f8c5f57 Method is void, let's not print void 2013-11-07 21:02:21 +01:00
Raphaël Doursenaud
8907c9944d Assigments in conditions is often considered bad practice 
So let's put a comment, just in case
 2013-11-07 20:51:30 +01:00
Raphaël Doursenaud
638764f86d Moved unreachable statement to conditions 2013-11-07 20:38:06 +01:00
Cédric Salvador
00c9df670c renamed templates 2013-11-06 10:22:01 +01:00
Cédric Salvador
c96b2d3b87 factorized form attach, documents list and links list for the document pages 2013-11-06 10:19:16 +01:00
Cédric Salvador
23008c3b31 factorized document actions 
Conflicts:
	htdocs/societe/document.php
 2013-11-06 10:11:40 +01:00
Grand Philippe
0ae489aee7 missing GETPOST 2013-10-30 09:34:59 +01:00