lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
47,328 Commits 43 Branches 150 Tags 886 MiB
b0baed83fc
Commit Graph

1031 Commits

Author SHA1 Message Date
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
Marcos García de La Fuente
bf7f4c1cab Refactored generateDocument functions 2014-09-21 18:16:14 +02:00
Marcos García de La Fuente
ca9e33e809 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into oop-pdf 2014-09-21 18:00:56 +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
9666d5e3ae Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	htdocs/.gitignore
	htdocs/core/lib/functions2.lib.php
	htdocs/install/mysql/migration/repair.sql
	htdocs/langs/en_US/errors.lang
 2014-09-18 10:17:43 +02:00
Laurent Destailleur
b16b1c2ce0 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/core/lib/functions2.lib.php
	htdocs/langs/en_US/errors.lang
	htdocs/product/class/product.class.php
 2014-09-18 10:08:56 +02:00
Laurent Destailleur
015b0d8036 Fix: Bad calculation of total 
Fix: Warning message not translated
 2014-09-18 10:05:37 +02:00
Laurent Destailleur
9379e28a94 Perf: Avoid duplicate load of project 2014-09-18 09:59:29 +02:00
Laurent Destailleur
736320ba47 Fix: Bad property 2014-09-18 09:36:47 +02:00
Marcos García de La Fuente
9dbf054026 Removed deprecated usage of project_pdf_create 2014-09-16 20:53:43 +02:00
Marcos García de La Fuente
e71dc6bc32 Created a method generateDocument for several classes 
Which are: Commande, Contrat, Livraison, Facture, Projet, Propal, Task, Expedition, CommandeFournisseur, FactureFournisseur and therefore deprecated the following methods supplier_order_pdf_create, supplier_invoice_pdf_create, delivery_order_pdf_create, task_pdf_create, propale_pdf_create, project_pdf_create, facture_pdf_create, expedition_pdf_create, commande_pdf_create
 2014-09-16 12:30:37 +02:00
Laurent Destailleur
83447243ae Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	build/debian/get-orig-source.sh
	htdocs/product/class/product.class.php
	htdocs/societe/soc.php
 2014-09-15 22:58:39 +02:00
Laurent Destailleur
19e017a2c1 Merge pull request #1879 from Cubexed/3.6 
-Renamed POST "project" to "projectstart" in fiche.php
 2014-09-14 21:16:51 +02:00
Laurent Destailleur
f264e25514 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/adherents/liste.php
	htdocs/compta/bank/bankid_fr.php
	htdocs/holiday/index.php
	htdocs/opensurvey/list.php
 2014-09-13 19:10:05 +02:00
Laurent Destailleur
8dd9358214 Fix: SQL injection 2014-09-13 19:04:25 +02:00
Cubexed
8a3bc25029 -Renamed POST "project" to "projectstart" to avoid strange behavior at project start date selector, probably the generic name "project" was interfering with something 2014-09-12 17:21:48 +02:00
Laurent Destailleur
744f370920 Merge remote-tracking branch 'origin/3.6' into develop 2014-09-11 17:47:58 +02:00
Raphaël Doursenaud
367d225d3e Fixed missing class include for task duplication 2014-09-08 16:13:29 +02:00
Raphaël Doursenaud
c5ccf2998b Fixed forgotten rename 2014-09-08 16:13:03 +02:00
Laurent Destailleur
4a91476be3 Try cut and paste to solve pb on class project. 2014-08-28 12:26:43 +02:00
Laurent Destailleur
fc02f0f08f Fix: No new inside a constructor method. 2014-08-21 23:43:11 +02:00
Frédéric FRANCE
bac870dc3b Update project.class.php 2014-08-15 22:23:23 +02:00
Laurent Destailleur
96cb9fe6cb Merge remote-tracking branch 'origin/3.6' into develop 2014-08-15 02:35:06 +02:00
Laurent Destailleur
6b6b372579 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/theme/eldy/graph-color.php
 2014-08-15 02:28:16 +02:00
Laurent Destailleur
aee35c86d6 Perf: Removed a useless distinct, add indexes. 2014-08-15 02:11:01 +02:00
Laurent Destailleur
5a0c66b9ad Qual: Use getNomUrl for project into list of timesheet. 2014-08-14 13:29:24 +02:00
Florian HENRY
329c0b2913 Fix: Missing include files.lib.php in some pages ti use 
dol_delete_recursive
 2014-08-13 12:42:55 +02:00
Laurent Destailleur
4eeb92d082 Fix: Bad help text 
Fix: Removed duplicate header
 2014-08-08 02:11:03 +02:00
Laurent Destailleur
75eb9cadc7 Merge pull request #1809 from KreizIT/fix_1549 
Fix :  [ bug #1549 ] It's not possible add ExtraFields
 2014-08-08 01:52:13 +02:00
Laurent Destailleur
42d992b009 Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	htdocs/compta/facture.php
	htdocs/core/lib/project.lib.php
	htdocs/fourn/facture/fiche.php
	htdocs/projet/class/project.class.php
 2014-08-08 01:26:53 +02:00
Laurent Destailleur
bceb72a9d1 Fix: Missing line total 2014-08-08 01:21:57 +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
e8ffb0dacf Fix: sql error on editing project with pgsql. 
Fix: Error management on project edit.
 2014-08-08 01:02:59 +02:00
Laurent Destailleur
d0c3a7913f Fix: visible task into area "time" for "My task" must limit task to 
tasks i am assigned to.
 2014-08-07 12:15:18 +02:00
Laurent Destailleur
48fc945648 Fix: visible task into area "time" for "My task" must limit task to 
tasks i am assigned to.

Conflicts:
	htdocs/core/lib/project.lib.php
	htdocs/projet/activity/list.php
 2014-08-07 12:13:00 +02:00
Laurent Destailleur
a49bce10de Fix: When disabled, all fields must be disabled. Need backport. 
Conflicts:
	htdocs/projet/activity/list.php
 2014-08-07 12:09:28 +02:00
Laurent Destailleur
1e473839e7 Fix: visible task into area "time" for "My task" must limit task to 
tasks i am assigned to.
 2014-08-07 12:06:16 +02:00
Laurent Destailleur
9bc2957257 Fix: visible task into area "time" for "My task" must limit task to 
tasks i am assigned to.
 2014-08-07 12:05:42 +02:00
Laurent Destailleur
1016e05fc6 Fix: visible task into area "time" for "My task" must limit task to 
tasks i am assigned to.
 2014-08-07 11:50:34 +02:00
Laurent Destailleur
ebc11a7a9c Fix: When disabled, all fields must be disabled. Need backport. 2014-08-07 11:50:25 +02:00
Laurent Destailleur
b7cb2e6b9d Fix: visible task into area "time" for "My task" must limit task to 
tasks i am assigned to.
 2014-08-07 11:48:19 +02:00
Laurent Destailleur
96b49cfabe Fix: When disabled, all fields must be disabled. Need backport. 2014-08-07 11:08:36 +02:00
KreizIT
c94c0699d8 Fix : [ bug #1549 ] Itïs not possible add ExtraFields 2014-08-06 17:38:44 +02:00
Maxime Kohlhaas
108cf11c8b Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2014-07-24 09:01:54 +02:00
Marcos García de La Fuente
4f4ac30fc0 Deprecating arbitrary use of dol_htmloutput* functions 2014-07-20 02:32:13 +02:00
Marcos García de La Fuente
43597c1731 Migrated old error notifications to the """new""" system 2014-07-20 01:43:46 +02:00
Laurent Destailleur
92a5ebc459 - New: Home page of project area shows list of draft project (like other 
main page).
- New: Can search on project ref or string from project main page (like
other main page).
 2014-07-17 01:28:01 +02:00
Laurent Destailleur
8a8a90de78 Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	ChangeLog
 2014-07-15 23:30:15 +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
Marcos García de La Fuente
ec661d0c6c Removed index.php and replaced them with blank index.html as it is more appropriate 2014-07-12 23:18: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
7cbee97f6e Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	.travis.yml
 2014-07-08 20:26:38 +02:00
Laurent Destailleur
0e78e631c1 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	.travis.yml
 2014-07-08 20:22:51 +02:00
Laurent Destailleur
0eabf26d27 Fix: Checkstyle 2014-07-08 01:15:59 +02:00
Laurent Destailleur
ad4babb154 Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	.travis.yml
	htdocs/fichinter/fiche.php
 2014-07-08 01:12:55 +02:00
Laurent Destailleur
36e6f9a9fc Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	.travis.yml
 2014-07-08 01:06:17 +02:00
BENKE Charles
4d9f78dc07 getlibstatut added 
Add function getlibstatut and libstatut on task (fk_statut allready present on project_task table)
 2014-07-06 15:06:34 +02:00
Laurent Destailleur
be4fe3d0d0 Merge branch 'syslog' of github.com:marcosgdf/dolibarr into 
marcosgdf-syslog

Conflicts:
	htdocs/contrat/class/contrat.class.php
	htdocs/fichinter/class/fichinter.class.php
	htdocs/projet/class/project.class.php
	htdocs/projet/class/task.class.php
 2014-07-04 13:43:50 +02:00
KreizIT
e0201535e2 Fix: [ bug #1505, #1504] Project trigger problem 2014-07-03 17:15:42 +02:00
Maxime Kohlhaas
b301c54b7e Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2014-07-03 08:28:00 +02:00
Marcos García de La Fuente
7e1cf124b8 Merge branch 'develop' into syslog 
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/core/class/commonobject.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/product/class/product.class.php
	htdocs/product/stock/lib/replenishment.lib.php
	htdocs/societe/soc.php
 2014-07-02 21:20:02 +02:00
BENKE Charles
96876992d4 navigate (next/prev) error on task of project 
use the same showrefnav function setting present in task.php file (who
work fine)
 2014-07-02 04:27:18 +02:00
BENKE Charles
7dca46df57 navigate (next/prev) error on task of a project 2014-07-02 04:24:26 +02:00
Laurent Destailleur
018e1d31e3 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/comm/propal.php
	htdocs/commande/class/commande.class.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/product/class/product.class.php
	htdocs/projet/class/project.class.php
 2014-06-25 20:22:25 +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
Maxime Kohlhaas
3269b463bb Fix / New : return on project page after task deletion instead of task list 2014-06-24 15:02:09 +02:00
Laurent Destailleur
d19b34cc7e Fix: Renaming a project with uplaoded files failed. 2014-06-21 15:45:53 +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
Laurent Destailleur
e8bca38daf Fix: syntax error 2014-06-14 13:41:15 +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
Marcos García de La Fuente
56abf1cd72 Removed duplicated SQL error logging 2014-06-13 02:28:30 +02:00
Marcos García de La Fuente
0ed2481a20 Removed unuseful errors 2014-06-13 01:46:27 +02:00
Marcos García de La Fuente
ca0a6cb307 Removed SQL string from call debug log 2014-06-13 01:34:39 +02:00
Laurent Destailleur
1a9e53e21f Fxi: Correct property name 2014-06-12 22:00:16 +02:00
Marcos García de La Fuente
9fbd7806f0 More substitutions 2014-06-12 11:31:53 +02:00
Laurent Destailleur
bb8516274e Fix: socid was not caught. 
Fix: numbering modules was not correctly scanned.
 2014-06-11 18:01:15 +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
Raphaël Doursenaud
c48c3a9d91 Qual: remove PHP closing tag (again) 
These were reintroduced by careless merge
 2014-05-26 13:51:25 +02:00
Laurent Destailleur
d41f87acab Fix: Option to limit was not used everywhere. 2014-05-26 01:27:22 +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
3fd7e18c08 Fix: Bad translation into title of action buttons 2014-05-10 17:00:55 +02:00
Laurent Destailleur
4e41b721fb Fix: Nb of notes and doc not visible onto tasks. 2014-05-10 16:43:47 +02:00
Laurent Destailleur
62537cf5a4 Fix: translation 2014-05-09 13:39:10 +02:00
Laurent Destailleur
8bf1fde598 New: Can set page to use for getNomUrl of project. 2014-05-09 13:21:10 +02:00
Laurent Destailleur
c0af0c3b52 Fix: translation 2014-05-08 20:29:16 +02:00
Laurent Destailleur
5923a754d1 New: Add hooks for project card 2014-05-08 20:02:34 +02:00
Laurent Destailleur
7bfbc4cbf3 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/core/modules/modExpedition.class.php
	htdocs/projet/class/project.class.php
 2014-05-07 19:30:19 +02:00
Florian HENRY
45e134bfef Better error return for project delete method 2014-05-07 15:11:46 +02:00
Florian HENRY
3f22bc7009 Better error management in delete project method 2014-05-07 15:08:44 +02:00
Florian HENRY
e6708a5072 Fix error return project deletion 2014-05-07 15:05:40 +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
d97c45a9b8 Add version of phpunit into travis script. 
Fix: strict mode.
 2014-05-01 19:17:45 +02:00
Laurent Destailleur
19d71ffb38 Prepare fix to hide images generated by "preview" feature. 2014-04-29 21:14:55 +02:00
Laurent Destailleur
97fce71218 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/core/lib/functions2.lib.php
	htdocs/install/mysql/migration/repair.sql
	htdocs/langs/en_US/errors.lang
	htdocs/product/fiche.php
	htdocs/projet/tasks/task.php
 2014-04-26 22:35:35 +02:00
Laurent Destailleur
537ada96a8 Fix: [ bug #1354 ] Tasks disapear in same sub-task 
Conflicts:
	htdocs/install/mysql/migration/repair.sql
	htdocs/projet/class/project.class.php
 2014-04-26 21:47:15 +02:00
Laurent Destailleur
af2cf0b66f Fix: [ bug #1354 ] Tasks disapear in same sub-task 2014-04-26 21:36:58 +02:00
Raphaël Doursenaud
d95b5e4a39 Fixed typo 2014-04-22 16:43:19 +02:00
BENKE Charles
c55e51d825 Update project.class.php 2014-04-19 14:59:42 +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
BENKE Charles
09d231ad0a Update project.class.php 2014-04-19 12:36:15 +02:00
Laurent Destailleur
1b02cdd352 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	ChangeLog
	dev/initdata/mysqldump_dolibarr_3.5.0.sql
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/product/index.php
	htdocs/user/fiche.php
 2014-04-12 00:53:25 +02:00
Laurent Destailleur
6f40825270 Merge pull request #1527 from grandoc/3.5 
translation and cleaning
 2014-04-09 00:31:57 +02:00
Laurent Destailleur
60b37dffe1 Fix: [ bug #1323 ] generation of odt files for tasks. 2014-04-09 00:07:32 +02:00
Laurent Destailleur
4e619c42fa Fix: [ bug #1340 ] Erreur de langage dans les projets 2014-04-08 23:56:10 +02:00
Grand Philippe
fe49f55a48 fix from forum 2014-04-07 11:01:11 +02:00
Laurent Destailleur
da0aebb2e9 Fix: Can't add user 2014-04-05 12:40:24 +02:00
Laurent Destailleur
c7c640f925 Fix: Can't add user 2014-04-05 12:38:59 +02:00
Laurent Destailleur
f3bbf54447 Fix: [ bug #1307 ] Quotes get removed from several inputs 2014-04-02 11:52:09 +02:00
Laurent Destailleur
c2b7e40aa1 Merge pull request #1507 from GPCsolutions/3.5-taskswithtime 
Project: make tasks accept a time
 2014-03-27 15:56:26 +01:00
Florian Henry
f93df7f3da remove debug string 2014-03-26 10:09:29 +01:00
Florian Henry
3d12979b3f remove debug string 2014-03-26 09:53:48 +01:00
Raphaël Doursenaud
7d0853d9e5 Removed debug code 2014-03-25 11:36:22 +01:00
Raphaël Doursenaud
d9cb1da4d5 Project: make tasks accept a time 2014-03-24 15:26:36 +01:00
Laurent Destailleur
f9c1b590d0 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	build/debian/changelog
	build/doxygen/dolibarr-doxygen.doxyfile
	build/exe/doliwamp/doliwamp.iss
	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/compta/facture.php
	htdocs/core/modules/import/import_csv.modules.php
	htdocs/filefunc.inc.php
 2014-03-19 22:29:18 +01:00
Laurent Destailleur
8cf3d258f4 Fix: Bug into calculation of total of time for tasks 2014-03-17 15:13:24 +01:00
Laurent Destailleur
58add21719 Merge pull request #1488 from atm-maxime/mko1300 
Add task 1300 : Add thm field on user and time spent to be able to calculate employee cost
 2014-03-16 20:26:57 +01:00
Maxime Kohlhaas
0083e529c7 Add task 1300 : Add thm field on user and time spent to be able to calculate employee cost 2014-03-16 14:31:02 +01:00
Maxime Kohlhaas
fe767606da New PHPUnit test on project + clean initAsSpecimen 2014-03-16 13:55:32 +01:00
Laurent Destailleur
cafa61ef7d Fix: Use correct syntax of date into sql requests (with quotes) 2014-03-15 23:12:00 +01:00
Laurent Destailleur
561a1a1aac Fix: Miscellaneous problems on task tabs (withproject parameter lost and 
download fails).
 2014-03-14 02:07:54 +01:00
Laurent Destailleur
1b85f83dbb Merge pull request #1466 from marcosgdf/minor 
Minor style and translation corrections
 2014-03-13 11:53:52 +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
e76f2170b3 Fix: Avoid home project page to hung when too many tasks opened. 2014-03-12 02:49:11 +01:00
Laurent Destailleur
4a983811d0 Fix: Avoid home project page to hung when too many tasks opened. 2014-03-12 02:43:31 +01:00
Laurent Destailleur
241ae7a4d1 Fix: Miscellaneous bugs on tasks management 
Conflicts:
	htdocs/core/lib/project.lib.php
 2014-03-11 20:53:47 +01:00
Laurent Destailleur
afca98323b Fix: Miscellaneous bugs on tasks management 2014-03-11 20:38:29 +01:00
Marcos García de La Fuente
b80c93d277 Added missing info tooltip for project document models 2014-03-11 13:15:14 +01:00
Marcos García de La Fuente
64e76852c5 Corrected projects admin page translation 2014-03-11 11:37:42 +01:00
Laurent Destailleur
6860ae84b9 Avoid browser to hang by adding PROJECT_MAX_NB_TASKS. 2014-03-11 09:48:45 +01:00
Laurent Destailleur
932b421d1d Merge remote-tracking branch 'origin/3.5' into develop 2014-03-11 09:46:51 +01:00
Laurent Destailleur
c9edced656 - New: Add filter on project status into task list. By default, only 
"opened" project are visible.
- New: Status "validated" for project are renamed into "opened".
 2014-03-11 09:43:26 +01:00
Laurent Destailleur
97677f08a9 Fix: Add protection to avoid memory hung 2014-03-10 01:49:44 +01:00
Laurent Destailleur
2a853329e5 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/core/class/doleditor.class.php
	htdocs/main.inc.php
	htdocs/product/class/product.class.php
 2014-03-08 14:25:59 +01:00
Léo
aeaf4bf5f8 Update index.php from Project folder 
A trailing "quote" sign was causing a problem with the link generation of href in the recap table on dashboard.
 2014-03-04 02:29:18 +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
Alexis Algoud
9de372d4b1 debug planned_workload loosing value on error 2014-03-02 17:33:51 +01:00
Laurent Destailleur
6662f8b5a3 Fix: Bad picto for project setup page 2014-02-28 21:54:50 +01:00
BENKE Charles
42ffb4b3e7 Update project.class.php 
escape ref of project if as ' is typed inside as ref (crazy user)
 2014-02-21 22:39:45 +01:00
Laurent Destailleur
b4977cd542 Fix: Bad permission var 2014-02-12 12:52:31 +01:00
Laurent Destailleur
d8b8f8c646 Uniformize code for contacts forms. 2014-02-04 20:49:07 +01:00
Laurent Destailleur
0da1a64335 Fix: Missing vars and bar id. 2014-02-04 20:41:23 +01:00
Laurent Destailleur
8d8e016115 Merge remote-tracking branch 'origin/3.5' into develop 2014-01-20 02:42:37 +01:00
Laurent Destailleur
0d18892506 Merge from 3.4 2014-01-20 02:21:30 +01:00
Laurent Destailleur
1fd67807ce Merge remote-tracking branch 'origin/3.5' into develop 2014-01-18 01:13:29 +01:00
Laurent Destailleur
bd1a10c116 Fix: doxygen 2014-01-14 16:49:06 +01:00
Grand Philippe
b61ccb8234 Fix: path to image must not be hardcoded but use dol_buildpath or img_picto with param src=1 2014-01-13 10:15:07 +01:00
Laurent Destailleur
23eb0f3770 Qual: Mutualize code for actions of editing notes 
New: Add button 'cancel' to cancel edition of a note (private or public)
 2014-01-11 13:33:30 +01:00
Laurent Destailleur
7fd34e5ff6 Fix: [ bug #1208 ] Users without read permission on the tasks can still 
see all project tasks
Fix: function clean_orhpelins was reporting wrong number of cleaned
orphelins.
 2014-01-06 13:34:26 +01:00
Laurent Destailleur
7afdad60a0 Fix: [ bug #1208 ] Users without read permission on the tasks can still 
see all project tasks
 2014-01-06 12:42:50 +01:00
Laurent Destailleur
bfd229d484 Fix: [ bug #1079 ] External users can't access projects even if it is a 
contact.
 2013-12-01 18:14:19 +01:00
Laurent Destailleur
f207aabe7a Fix: When editing thirdparty, result is not refreshed 2013-12-01 18:13:57 +01:00
Cédric Salvador
00c9df670c renamed templates 2013-11-06 10:22:01 +01:00
Cédric Salvador
6c22af00e1 factorization 2013-11-06 10:20:54 +01:00
Cédric Salvador
039bd5b4c8 checkstyle 2013-11-06 10:20:11 +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
Laurent Destailleur
922929fffb Fix: Missing column 
Fix: Line was not added correctly
Fix: Missing message
 2013-11-05 11:17:54 +01:00
Laurent Destailleur
692aa66cad Fix: Tons of bug with new field planned_workload 2013-10-30 21:44:04 +01:00
Laurent Destailleur
d5d252dada Fix: [ bug #1077 ] Project card does not update vinculated third when 
modified upon refresh
 2013-10-23 18:35:18 +02:00
Laurent Destailleur
fe4df6770a Fix: [ bug #1077 ] Project card does not update vinculated third when 
modified upon refresh
 2013-10-23 18:26:18 +02:00
Laurent Destailleur
3a46348988 Fix: checkstyle 2013-10-20 14:31:08 +02:00
Florian Henry
9555cb35f0 Add project clone option : copy project files, copy task files 2013-10-19 17:51:21 +02:00
Laurent Destailleur
3fde695c94 Qual: Uniformise name of include files we use to share common code found 
into Actions area of pages (controllers).
 2013-09-23 13:22:28 +02:00
Cédric Salvador
fc136d0d06 changed parameter 2013-09-16 14:17:53 +02:00
Cédric Salvador
d9a26d0aa9 natural search in list pages 2013-09-16 14:17:53 +02:00
Laurent Destailleur
305c1d63a7 Qual: Uniformize code. No useless redirect. use GETPOST. 2013-09-06 13:25:45 +02:00
Laurent Destailleur
91718bc902 Qual: Replace deprecated call ->form_confirm with ->formconfirm 2013-09-06 11:51:24 +02:00
Raphaël Doursenaud
36a281ce58 CSS fixes 2013-09-05 20:54:19 +02:00
Raphaël Doursenaud
7681c60f6b Silly assignment was a bug 2013-09-05 17:22:51 +02:00
Raphaël Doursenaud
9046d620e1 Avoid using the same var as outer loop 2013-09-05 17:15:06 +02:00
Laurent Destailleur
afae841ae4 Fix: Permissions on files 2013-08-06 00:36:21 +02:00
Laurent Destailleur
c41a955cbe Fix: Permissions on files 2013-08-06 00:36:04 +02:00
Laurent Destailleur
75e2350e6a Fix: Mutualizing code fix bug into duplicate code of contact management 
for project.
 2013-07-30 19:08:58 +02:00
Laurent Destailleur
67820774bb Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	ChangeLog
	htdocs/commande/fiche.php
	htdocs/core/class/extrafields.class.php
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
 2013-07-27 14:21:47 +02:00
Laurent Destailleur
3c6b1f17d1 Fix: print of a function that already contains the print. 2013-07-27 14:10:57 +02:00
BENKE Charles
6ffaefc002 Update element.php 
Display of project element limited by user rights
 2013-07-23 05:49:30 +02:00
Laurent Destailleur
e80583bfb7 Fix: W3C 2013-07-23 01:56:14 +02:00
Laurent Destailleur
d802470aae I killed <td nowrap>. Hello <td class="nowrap"> ! 2013-07-19 14:23:42 +02:00
Florian Henry
0c0a64f532 [ task #924 ] Add numbering rule on task 
[ task #925 ] Add ODT document generation for Tasks in project module
 2013-07-18 10:24:45 +02:00
Florian Henry
ee82330292 On going sync/merge from other repo 2013-07-17 19:17:54 +02:00
Florian Henry
2476e7bcaf Start functionnality 2013-07-17 18:45:58 +02:00
Laurent Destailleur
2bc650bf61 Qual: Remove tons of codesniffer errors and warnings. 2013-07-07 13:14:32 +02:00
Regis Houssin
05bd035488 Fix: convert line delimiters 2013-06-24 17:34:22 +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
f2e2815cc1 Merge branch 'develop' into dev_projecthtmlform 2013-06-15 11:56:45 +02:00
Florian Henry
8fb2b8fa12 Start normalize project module : create html.formprojet.class.php with 
selec_project
 2013-06-14 22:33:01 +02:00
Laurent Destailleur
499440be16 Merge remote-tracking branch 'origin/3.4' into develop 2013-06-14 01:29:43 +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
Regis Houssin
c9a71439b2 Fix: EOF 2013-06-05 16:24:32 +02:00
Laurent Destailleur
5bba5782a4 Merge remote-tracking branch 'origin/3.4' into develop 2013-05-29 21:22:27 +02:00
Laurent Destailleur
1cb33c43bd Merge remote-tracking branch 'origin/3.3' into 3.4 
Conflicts:
	htdocs/comm/action/listactions.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/lib/agenda.lib.php
	htdocs/product/liste.php
 2013-05-29 01:30:36 +02:00
Christophe Battarel
b8c51e3760 sort tasks by start date 2013-05-25 11:49:05 +02:00
Christophe Battarel
b89b7405f8 update function comments header 2013-05-23 22:54:06 +02:00
Christophe Battarel
b96bff4770 [ bug #806 ] Tasks are ordered alphabetically instead of chronological order 2013-05-23 22:51:27 +02:00
fhenry
be525ad0e8 Better code quality for [ task #531 ] Add a duration on tasks 2013-05-15 14:19:16 +02:00
fhenry
b280bff809 Update comments0 2013-05-14 20:33:56 +02:00
fhenry
7de861eee4 Beteer display 2013-05-14 20:30:18 +02:00
fhenry
d0b4cef7a4 Change duration _planned by planned_workload 2013-05-14 20:22:33 +02:00
fhenry
760ae88f39 [ task #531 ] Add a duration on tasks 2013-05-13 17:08:36 +02:00
Laurent Destailleur
6c4e47514d Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/holiday/fiche.php
 2013-05-11 15:26:24 +02:00
Marcos García
54a2d3ca72 Corrected translations of info tooltips in document models description 2013-05-07 22:04:08 +02:00
fhenry
8c37063541 Fix bug [ bug #881 ] some errors 2013-05-07 18:59:28 +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
fhenry
0b8d78c4f6 [ bug #865 ] Dolibarr navigation array in project/task do not work 
Conflicts:
	htdocs/projet/fiche.php

Change-Id: I7607f97d21cc695c9b295d94f5abcb64fe25f3af
 2013-04-30 18:23:44 +02:00
fhenry
59f218ab42 [ bug #865 ] Dolibarr navigation array in project/task do not work 2013-04-30 16:00:30 +02:00
Laurent Destailleur
1e9157603d Merge pull request #900 from defrance69/patch-3 
Update project.class.php
 2013-04-29 10:27:55 -07:00
BENKE Charles
d9363f441a Update project.class.php 
Add feature to add element in elements page of a project
 2013-04-29 13:02:58 +03:00
BENKE Charles
830aff99e4 Update element.php 
add feature: join element from element page
 2013-04-29 12:54:29 +03:00
fhenry
91885a8bd4 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-04-26 20:54:53 +02:00
Laurent Destailleur
2a74cb81f0 Fix: Removed warnings 2013-04-26 19:13:39 +02:00
fhenry
5dce16863f Review delete extrafield in delete class method 2013-04-26 17:20:21 +02:00
fhenry
a06581771c Reveiw extrafield for womplaiance with wiki 
http://wiki.dolibarr.org/index.php/Extrafields
 2013-04-26 10:29:14 +02:00
Laurent Destailleur
4e0ef01389 Qual: nowrap="nowrap" is replaced with a CSS class style .nowrap 2013-04-25 01:13:13 +02:00
Regis Houssin
1be6a2c120 Fix: broken features for fileupload 2013-04-22 14:39:25 +02:00
Regis Houssin
63a5aee80e Fix: broken features for fileupload 2013-04-22 14:37:18 +02:00
Juanjo Menent
2d9da0c4cf Merge pull request #848 from GPCsolutions/note 
Note update fixes batch
 2013-04-20 00:43:05 -07:00
Raphaël Doursenaud
13c48d4970 Fixed more private note updates 2013-04-20 06:43:14 +02:00
Raphaël Doursenaud
a564edbb87 Fixed private note update 2013-04-20 06:43:14 +02:00
Raphaël Doursenaud
e3610dfa49 Forgotten update_note parameter 
Fixes project cloning
 2013-04-20 05:53:18 +02:00
Laurent Destailleur
ac8868e2d2 Fix: Use correct format for js 2013-04-18 19:56:14 +02:00
fhenry
00fb40e073 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/langs/ca_ES/admin.lang
	htdocs/langs/es_ES/admin.lang

Change-Id: I3c2c0789a92fb3d5506c717986ce0127dec75b9b
 2013-04-14 09:40:01 +02:00
Laurent Destailleur
ae01285fe9 Look: Replace table with div. 
Look: Optimize for smartphone
 2013-04-12 16:16:39 +02:00
fhenry
cc497490eb [ task #814 ] Add extrafield feature into Project/project tasks module 2013-04-12 11:09:53 +02:00
Laurent Destailleur
b496436fe3 Qual: Reduce number of methods. Mutualize update_note code. 2013-04-10 10:58:38 +02:00
fhenry
b5751ab658 Add copyright 2013-03-25 19:31:17 +01:00
fhenry
9dd4ed9cb8 [ task #770 ] Add ODT document generation for Projects module 2013-03-25 19:28:34 +01:00
BENKE Charles
5ad98a8652 Update index.php 
rename search_product by search_project (the real search thing)
 2013-03-01 00:56:29 +01:00
Grand Philippe
6adc9eb7f2 english language standardization 2013-02-23 17:40:28 +01:00
Grand Philippe
4f9f32eb3e english language standardization 2013-02-23 16:37:17 +01: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
56e11e52fa New: hookmanager class is used frequently and is a factory object, so we 
can move it during init of environment and use it globally.
 2013-01-25 19:12:54 +01:00
Laurent Destailleur
abb6daf2dc Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/core/boxes/box_activity.php
 2013-01-19 16:29:16 +01:00
Laurent Destailleur
0e13b3872d Fix: Removed warnings 2013-01-19 14:32:37 +01:00
Laurent Destailleur
d11cee399a Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	COPYRIGHT
	htdocs/core/tpl/freeproductline_create.tpl.php
	htdocs/core/tpl/predefinedproductline_create.tpl.php
	htdocs/install/mysql/tables/llx_c_availability.sql
 2013-01-16 15:45:17 +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
Laurent Destailleur
29e6d01e51 Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/core/tpl/freeproductline_create.tpl.php
	htdocs/core/tpl/predefinedproductline_create.tpl.php
 2013-01-13 19:33:54 +01:00
Laurent Destailleur
a1282f5236 Fix: Navigation into projects 2013-01-10 16:04:23 +01:00
Laurent Destailleur
53df0766cb Fix: Translation 2013-01-08 18:47:40 +01:00
Laurent Destailleur
380d036d5c Fix: Bad test onto project list id 2013-01-02 15:12:46 +01:00
Regis Houssin
b838895db9 Fix: change for a neutral email 2012-12-30 15:13:49 +01:00