Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity
112,767 Commits 35 Branches 179 Tags 1.7 GiB
e3a0220658
Commit Graph

433 Commits

Author SHA1 Message Date
aspangaro
d8f56eb406 New: better integration in project for donation module 
Fixed: Rename fk_project in fk_projet (Sic!) for better compatibility
 2015-04-02 06:36:32 +02:00
aspangaro
4918326958 Fixed: Wrong path to don.class in element project 2015-04-01 08:13:10 +02:00
aspangaro
b60f1e33d6 Debug 2015-03-26 06:29:16 +01:00
aspangaro
9d34b40897 Merge remote-tracking branch 'Upstream/develop' into develop-ReviewAssoc 
Conflicts:
	htdocs/compta/bank/account.php
 2015-03-24 05:28:57 +01:00
Laurent Destailleur
cbadfa5075 NEW: Title of page project contains project ref and label 2015-03-23 12:44:41 +01:00
aspangaro
c9d31dab3a Move module Dons in htdocs->donations 2015-03-19 05:41:13 +01:00
aspangaro
dbeccf7653 Update work 2015-03-18 21:56:00 +01:00
Laurent Destailleur
a5645b626c Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/core/tpl/objectline_view.tpl.php
	htdocs/projet/element.php
 2015-03-11 03:55:46 +01:00
Laurent Destailleur
c1432eb2da Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/compta/salaries/fiche.php
	htdocs/projet/element.php
 2015-03-11 03:29:52 +01:00
Raphaël Doursenaud
f8dfa61859 FIXED #1901: Inverted supplier order/invoice buttons in project referring objects 2015-03-09 16:20:51 +01:00
frederic34
4af26c119f fetch object in include file 2015-03-02 17:54:35 +01:00
Laurent Destailleur
45a90b54fe Fix: param to set id of object into url must be id everywhere (except 
company, it might be socid)
 2015-03-02 02:14:18 +01:00
Alexis Algoud
5bc3763945 fix supplier order element 2015-02-24 18:23:40 +01:00
Alexis Algoud
b4f3068141 NEW add PDF icon on linked element into project 2015-02-24 18:20:19 +01:00
Laurent Destailleur
6d3834b3b9 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/index.php
	htdocs/projet/class/project.class.php
	test/phpunit/BankAccountTest.php
 2015-02-23 14:59:24 +01:00
Laurent Destailleur
ae8d090ebe Fix No default filter by default, we miss data 2015-02-23 11:43:38 +01:00
Laurent Destailleur
30a5111c68 Work on expense report module 2015-02-21 15:18:05 +01:00
Laurent Destailleur
2e0b2fb012 Work on expensereport module 2015-02-15 22:49:23 +01:00
Laurent Destailleur
e0f86f0270 Oubli sur option PROJECT_HIDE_TASKS 2015-02-02 21:33:09 +01:00
Laurent Destailleur
b36e40ee4c Fix feature to break by email 2015-02-02 21:12:43 +01:00
Laurent Destailleur
59711298c3 Fixed: Length of project label is no more truncated on element cards 
(invoice, proposal, order...)
 2015-01-30 16:33:39 +01:00
Laurent Destailleur
4fdc287717 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/accountancy/customer/card.php
	htdocs/accountancy/journal/sellsjournal.php
	htdocs/admin/menus.php
	htdocs/fourn/commande/card.php
	htdocs/install/check.php
 2015-01-30 15:53:06 +01:00
Laurent Destailleur
5306220e5e Fixed: Translation 2015-01-23 02:21:43 +01:00
Laurent Destailleur
71a8f97c89 Optimize code 2015-01-23 02:11:10 +01:00
Laurent Destailleur
eedca43cc3 New: Add option PROJECT_ADD_SUBTOTAL_LINES to group by supplier lines 
into refering project view.
 2015-01-22 21:31:00 +01:00
Laurent Destailleur
b7328caa9a Fixed: Bad date for supplier orders 2015-01-22 20:40:53 +01:00
Laurent Destailleur
36c083e9db Fixed: Refresh was doing update 2015-01-22 18:44:02 +01:00
Laurent Destailleur
5c5ff72ecd Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	ChangeLog
	htdocs/adherents/fiche.php
	htdocs/comm/fiche.php
	htdocs/comm/mailing/fiche.php
	htdocs/comm/propal.php
	htdocs/comm/propal/class/propal.class.php
	htdocs/commande/class/commande.class.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/compta/paiement.php
	htdocs/core/class/html.formcompany.class.php
	htdocs/core/tpl/login.tpl.php
	htdocs/expedition/fiche.php
	htdocs/fourn/commande/fiche.php
	htdocs/fourn/facture/fiche.php
	htdocs/fourn/facture/paiement.php
	htdocs/fourn/fiche.php
	htdocs/main.inc.php
	htdocs/product/fournisseurs.php
	htdocs/resource/card.php
 2015-01-18 17:13:42 +01:00
Marcos García de La Fuente
6c4702f282 Fix: [ bug #1785 ] Start date is lost in Project > Linked objects 2015-01-13 09:11:04 +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
Marcos García de La Fuente
a90a03412a Fixed string not translated in linked objects of a project 2014-12-23 15:43:45 +01:00
Laurent Destailleur
c571013fc9 Merge remote-tracking branch 'origin/3.6' into 3.7 2014-12-18 23:55:07 +01:00
Florian HENRY
c209d16881 [ bug #1749 ] Undefined $mailchimp 2014-12-18 15:42:28 +01:00
Laurent Destailleur
ec9c3cc115 Fix: Better translation 2014-12-04 11:53:44 +01:00
Laurent Destailleur
05059da9e8 Fix: [ bug #1631 ] technical error in the display of associated objects 
/ erreur technique à l'affichage des objets associés à un projet
 2014-11-17 01:06:30 +01:00
Laurent Destailleur
65b73ab778 Fix: td balance 2014-10-29 20:24:33 +01:00
Laurent Destailleur
a0c9af2385 New: Can filter on date into tab "Referring object" of a project. 2014-10-29 20:21:24 +01:00
Laurent Destailleur
d0da5ef047 Merge pull request #1910 from FHenry/develop 
Better accountancy auto find accountancy code feature (work with several
 2014-09-22 23:48:32 +02:00
Florian HENRY
119be5da42 Better ressource management on project and task 2014-09-20 10:14:26 +02:00
aspangaro
0b20369dd7 Qual: Renamed all files & links "fiche.php" into "card.php" 2014-09-18 21:18:25 +02:00
aspangaro
b22aef3521 Qual: Renamed all files & links "liste.php" into "list.php" 2014-09-18 20:33:37 +02:00
Laurent Destailleur
9379e28a94 Perf: Avoid duplicate load of project 2014-09-18 09:59:29 +02:00
Laurent Destailleur
fc02f0f08f Fix: No new inside a constructor method. 2014-08-21 23:43:11 +02:00
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
Laurent Destailleur
8044300ef7 Work on gantt view. 2010-05-23 20:37:28 +00:00
Laurent Destailleur
ba908ed743 Fix: If user has no permission to see all projects, see only its projects 2010-05-23 20:01:10 +00:00
Regis Houssin
39701fc5e6 Fix: rights error 
Todo: uniformiser les noms de modules, leur repertoire et leurs droits
 2010-04-30 07:16:18 +00:00
Philippe Grand
b749e6bdcf according to new tree directory 2010-04-29 14:34:21 +00:00
Regis Houssin
e4ea54f315 Fix: move class to class directory 
Fix: mutualize code
 2010-04-28 17:30:59 +00:00
Philippe Grand
3f4bee1f18 according to new tree directory 2010-04-28 12:53:28 +00:00
Philippe Grand
911c57b951 according to new tree directory 2010-04-28 12:24:06 +00:00
Philippe Grand
faf19c91ae according to new tree directory 2010-04-28 08:35:57 +00:00
Philippe Grand
009b251d52 according to new tree directory 2010-04-27 08:13:42 +00:00
Philippe Grand
c418128a07 according to new tree directory 2010-04-25 14:17:39 +00:00
Philippe Grand
4cdf6d0bae according to new tree directory 2010-04-25 14:17:39 +00:00
Philippe Grand
99a19b2cbf according to new tree directory 2010-04-25 12:55:26 +00:00
Regis Houssin
73f216fd89 Fix: rename $class to $classname to prevents problems 
http://www.manuelphp.com/php/reserved.keywords.php
 2010-04-09 07:55:37 +00:00
Philippe Grand
57ae19fc71 Move file actioncomm.class.php to comm/action directory 2010-04-01 07:51:59 +00:00
Philippe Grand
3ce3c74ba7 Move facture class file to compta/facture directory 2010-03-26 15:45:01 +00:00
Philippe Grand
497c2a9204 move file class propal to comm/propal directory 2010-03-23 20:53:15 +00:00
Laurent Destailleur
435922ae37 New: Can link trips and expenses to a project. 2010-03-21 14:01:39 +00:00
Regis Houssin
92cfaa42d3 Fix: uniformise code 
Fix: prepare to compatibility with other module
 2010-03-11 10:25:55 +00:00
Regis Houssin
818fec7e6b Qual: First change to remove pre.inc.php 2010-03-01 08:42:10 +00:00
Laurent Destailleur
bda51b47a6 Fix: A lot of fix in project permissions 2010-02-21 17:01:45 +00:00
Laurent Destailleur
2fd6e376da Add more clear information for project view 2010-02-20 20:24:09 +00:00
Regis Houssin
cee5d7873b Works on enhancement of project tasks 
Fix: security check
 2010-02-04 10:40:18 +00:00
Laurent Destailleur
93cf727a1c Some fix on project 2010-02-03 22:34:12 +00:00
Regis Houssin
4345d2563b Works on enhancement of project tasks 
Fix: data migration of llx_projet_task_actors in llx_element_contact
 2010-01-26 13:28:25 +00:00
Laurent Destailleur
e5658c3ae6 New: task #9802 : Can link an action to a project 2010-01-04 23:33:23 +00:00
Laurent Destailleur
2988b561c9 New: Project module support status of project and end date 2010-01-04 21:45:59 +00:00
Laurent Destailleur
c11cef6d47 Add help link to online wiki 2009-08-12 12:59:14 +00:00
Laurent Destailleur
72f1df8eab New: Enhancement in project module 2009-07-28 13:37:28 +00:00
Laurent Destailleur
86625da643 Predefined invoices are now always enabled 2009-05-27 01:59:33 +00:00
Laurent Destailleur
61e2282cb1 Qual: Removed deprecated code 2009-03-02 18:25:51 +00:00
Laurent Destailleur
0823322ba1 Qual: All call to dolibarr_ functions are made on dol_ functions. 2009-02-20 22:53:15 +00:00
Laurent Destailleur
0d386d7e6c Fix: A lot of debug in project module 2009-02-04 20:38:07 +00:00
Laurent Destailleur
e40fe712cd Major enhancement of project module 2009-01-14 23:36:51 +00:00
Laurent Destailleur
5cf2356bcb Do not allow to remove task with children 2009-01-12 20:26:06 +00:00
Laurent Destailleur
1af616666d Add contracts in project referrers 2008-12-31 15:10:21 +00:00
Laurent Destailleur
cc7ebc8251 Add status if referrer list of a project 2008-12-27 23:40:25 +00:00
Laurent Destailleur
90a73faaad New: Some enhancements in project module 2008-09-10 20:49:21 +00:00
Regis Houssin
6ac4014849 Fix: traduction 2008-04-29 06:23:29 +00:00
Laurent Destailleur
1c3e137547 Fix: Support option mysql strict for orders creation 
New: Add a tab referers in project card.
Qual: Mutualize all code for project referers view
 2008-04-19 17:34:24 +00:00
Laurent Destailleur
5e4f47a8d7 Fix: Support option mysql strict for orders creation 
New: Add a tab referers in project card.
Qual: Mutualize all code for project referers view
 2008-04-19 17:26:41 +00:00