Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
42,407 Commits 36 Branches 189 Tags
aabbc331a4eac871e7e1e05fbc4928cf3d20e4aa
Commit Graph

90 Commits

Author SHA1 Message Date
Laurent Destailleur
91aabbb40e Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/compta/facture.php
	htdocs/core/lib/project.lib.php
	htdocs/main.inc.php
 2014-08-08 01:19:03 +02:00
Laurent Destailleur
c52794ce7f Merge remote-tracking branch 'origin/3.4' into 3.5 
Conflicts:
	htdocs/projet/class/project.class.php
 2014-08-08 01:09:46 +02:00
Laurent Destailleur
9acf60d7c5 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	.travis.yml
	ChangeLog
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
	build/rpm/dolibarr_mandriva.spec
	build/rpm/dolibarr_opensuse.spec
	htdocs/core/class/html.formfile.class.php
 2014-07-14 23:36:10 +02:00
Marcos García de La Fuente
b0ae2fe2aa Fixed a bug introduced in commit 0916d2cf3b 2014-07-14 01:32:57 +02:00
Florian HENRY
3f23b116c6 [ bug #1522 ] Liste des propositions commerciales non filtée depuis un 
projet
 2014-07-11 11:44:54 +02:00
Laurent Destailleur
1db9514fed Fix: When an invoice is replaced with another, amount must not appears 
on total for project
 2014-06-24 22:02:56 +02:00
Laurent Destailleur
8d1fdec8cf Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/comm/propal.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/core/lib/pdf.lib.php
	htdocs/core/modules/expedition/doc/pdf_merou.modules.php
	htdocs/core/modules/modProduct.class.php
	htdocs/fourn/commande/fiche.php
	htdocs/projet/fiche.php
 2014-06-20 15:26:02 +02:00
Laurent Destailleur
f0ce92292a Fix: date start/end of project was lost on some tabs. 
Fix: Bad file name for gantt include.
 2014-06-14 14:20:58 +02:00
Florian HENRY
0916d2cf3b Fix link element from project "associates object" pages 
http://www.dolibarr.fr/forum/527-bugs-sur-la-version-stable-courante/50687-objet-associes-au-projet
 2014-06-13 15:54:37 +02:00
Laurent Destailleur
ccca46f380 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/comm/propal.php
	htdocs/comm/propal/list.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/core/lib/functions.lib.php
	htdocs/expedition/note.php
	htdocs/fourn/commande/liste.php
	htdocs/fourn/facture/fiche.php
	htdocs/main.inc.php
	htdocs/projet/tasks/index.php
	htdocs/theme/eldy/style.css.php
 2014-05-29 19:20:48 +02:00
Laurent Destailleur
3481884731 Fix: A project is linked to a thirdparty (may be a customer, a supplier 
or a prospect).
 2014-05-22 13:20:03 +02:00
Florian HENRY
87b9d0412c Fix element page on project 2014-05-22 12:51:00 +02:00
Laurent Destailleur
2bac66fd52 Merge remote-tracking branch 'origin/3.5' into develop 2014-05-10 19:53:06 +02:00
Laurent Destailleur
62537cf5a4 Fix: translation 2014-05-09 13:39:10 +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
BENKE Charles
ebab7a0b62 Update element.php 2014-04-19 13:06:11 +02:00
BENKE Charles
cebbf1607c Update element.php 2014-04-19 13:00:42 +02:00
Laurent Destailleur
4e619c42fa Fix: [ bug #1340 ] Erreur de langage dans les projets 2014-04-08 23:56:10 +02:00
BENKE Charles
6ffaefc002 Update element.php 
Display of project element limited by user rights
 2013-07-23 05:49:30 +02:00
Grand Philippe
b599481ef6 standardize code 2013-06-20 09:18:12 +02:00
Florian Henry
8a6a3fc9f4 Continue normalizing project html.formprojet.class.php 2013-06-17 14:25:33 +02:00
Florian Henry
2704ba5f36 Fix bug on attach element in element.php (simply not work before...) 2013-06-13 18:11:23 +02:00
Laurent Destailleur
fc0d5abd14 Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	ChangeLog
	htdocs/compta/prelevement/bons.php
	htdocs/compta/prelevement/fiche-stat.php
	htdocs/contact/class/contact.class.php
	htdocs/contrat/class/contrat.class.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/core/modules/modSociete.class.php
	htdocs/projet/fiche.php
	test/phpunit/FilesLibTest.php
 2013-05-03 00:15:02 +02:00
fhenry
7e47b37ade Fix [ bug #788 ] Date of linked interventions are not shown 2013-05-02 13:56:14 +02:00
BENKE Charles
830aff99e4 Update element.php 
add feature: join element from element page
 2013-04-29 12:54:29 +03:00
simnandez
ad91eab0ac [ task #652 ] Reduce clicks into creaton of orders, invoices, etc. 
Uniformize propal code (not use addpropal.php)
 2013-02-02 18:31:45 +01:00
Laurent Destailleur
8d206fdfb0 Prepare move to other licence. For the moment all answers for licence 
upgrade were not yet received. So we prepare for GPL by uniformizing
licence text keys to GPL-3+. Will move later to AGPL if all answers are
positive.
 2013-01-16 15:36:08 +01:00
Regis Houssin
b838895db9 Fix: change for a neutral email 2012-12-30 15:13:49 +01:00
Regis Houssin
43c0a03758 Fix: strict mode tornado 2012-09-15 11:21:22 +02:00
Regis Houssin
e19f8c54f1 Fix: strict mode hurricane 2012-09-15 10:01:35 +02:00
Marcos García
f3674317ec Removed parenthesis from all require and replaced with single quotes 2012-08-22 23:24:21 +02:00
Marcos García
706d79986c Removed parenthesis from all require_once and replaced with single quotes 2012-08-22 23:11:24 +02:00
Marcos García
9dc38f4382 Created rest of BackToList links 2012-07-28 21:49:47 +02:00
Laurent Destailleur
e6cd400bc3 Qual: List of elements must be into a page called "list.php". 2012-06-09 19:16:31 +02:00
Laurent Destailleur
1fec3b56d9 Fix: Permissions to see project 
Conflicts:
	htdocs/projet/fiche.php
 2012-05-23 14:34:44 +02:00
simnandez
2e9ef6f49a Fix: Missing translation 2012-03-09 17:21:53 +01:00
Laurent Destailleur
62054f2f98 Fix: A lot of fix into project permissions. Uniformize code. 2012-02-04 18:34:52 +01:00
Regis Houssin
56d6cbe56f [task #216] Move lib in core directory 2011-10-24 12:59:44 +02:00
Regis Houssin
2c1b3722f2 Fix: replace sizeof() by count() 2011-09-17 19:49:50 +00:00
Regis Houssin
27300fe898 Fix: remove obsolete tags (in progress) 2011-08-27 16:15:06 +00:00
Regis Houssin
726d9581dd Fix: remove obsolete tags (in progress) 2011-08-27 14:24:16 +00:00
Laurent Destailleur
37ead2f97e Fix: Avoid errors into rpm packages 2011-07-31 23:19:04 +00:00
Laurent Destailleur
416e37571a Fix: total amount 2011-04-14 23:24:34 +00:00
Laurent Destailleur
71f00ce669 New: Add net and without tax price of project referrer page. 2010-12-18 11:29:42 +00:00
Laurent Destailleur
7a6dcd287f Trad 2010-08-30 21:46:21 +00:00
Regis Houssin
aa62559812 Fix: fetch_client is deprecated 2010-08-06 13:56:25 +00:00
Laurent Destailleur
eb4ee0d42d Fix: Some fix in project referrers page. Add also third party in a column. 2010-06-28 21:26:36 +00:00
Laurent Destailleur
6dc8d0e390 Reorganize class files. 2010-06-05 15:20:09 +00:00
Laurent Destailleur
a7c809d0dd More fix on project permission. 
There is still errors on task (too many task shown) but project lists are ok.
 2010-05-30 12:21:32 +00:00
Laurent Destailleur
d4e693af3b Fix: Fix a lot of permissions on project module 2010-05-28 23:26:08 +00:00