Commit Graph

920 Commits

Author SHA1 Message Date
fmarcet
62ad7d4d34 FIX: Not showing task extrafields when creating from left menu 2015-08-04 13:32:44 +02:00
Laurent Destailleur
13dee1876a Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
	htdocs/compta/resultat/clientfourn.php
2015-07-30 15:07:22 +02:00
phf
824da6d2b0 FIX no projet_task_time id from trigger TASK_TIMESPENT_CREATE 2015-07-27 17:38:27 +02:00
Laurent Destailleur
ad5612158a Fix report of all error messages 2015-07-19 15:29:18 +02:00
Marcos García de La Fuente
f2313748c8 Merge branch '3.7' into bug-1634 2015-07-19 14:57:39 +02:00
Marcos García de La Fuente
1be33e1dda FIX [ bug 1634 ] Error deleting a project when it had many linked objects
Projet::delete was throwing DB error messages directly to the user instead of logging them and showing a proper error message to the user
2015-07-19 14:56:52 +02:00
Laurent Destailleur
2bb1945a2f Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
	htdocs/compta/prelevement/class/rejetprelevement.class.php
	htdocs/compta/sociales/class/paymentsocialcontribution.class.php
	htdocs/contact/exportimport.php
	htdocs/contact/ldap.php
	htdocs/contact/perso.php
	htdocs/contact/vcard.php
	htdocs/core/class/commonobject.class.php
	htdocs/product/reassort.php
	htdocs/projet/liste.php
	htdocs/societe/consumption.php
	htdocs/societe/info.php
2015-07-19 12:04:30 +02:00
Maxime Kohlhaas
ee643ed2a7 Fix : Project list was not keeping parameters on sorts 2015-07-02 14:08:16 +02:00
Laurent Destailleur
c97c5e0cfd Fix selection of user was lost 2015-04-23 13:54:49 +02:00
Laurent Destailleur
47ecb91a3e Avoid DOS attack when high number of tasks 2015-04-22 21:17:49 +02:00
Laurent Destailleur
5b29c87933 Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
	htdocs/compta/deplacement/fiche.php
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/expedition/fiche.php
2015-04-19 00:23:46 +02:00
Laurent Destailleur
ab77158757 Merge remote-tracking branch 'origin/3.5' into 3.6
Conflicts:
	htdocs/expedition/fiche.php
2015-04-18 23:55:17 +02:00
Marcos García de La Fuente
bbd01c0c8d Fix: Bug #2577 Incorrect invoice status in "Linked objects" page of a project 2015-04-12 20:59:58 +02:00
Laurent Destailleur
1272b03e5e Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
	build/debian/changelog
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/fourn/facture/fiche.php
	htdocs/product/stock/mouvement.php
	htdocs/projet/element.php
	htdocs/societe/rib.php
	htdocs/theme/bureau2crea/img/statut4.png
2015-04-12 12:03:59 +02:00
Laurent Destailleur
091420f8ae Close #2568 2015-04-08 20:40:01 +02:00
Marcos García de La Fuente
5c8e92d52a Closes #2535 Bug: Untranslated string in "Linked objects" page of a project 2015-04-04 17:52:05 +02:00
Laurent Destailleur
605a7dee0e Fix: Deleting task do not return to correct page 2015-03-14 11:56:28 +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
Laurent Destailleur
22045603b7 Fix bad update of denormalized field 2015-03-05 13:51:29 +01:00
Laurent Destailleur
8a67a3af10 Fix missing one param 2015-03-01 16:12:55 +01:00
Laurent Destailleur
5f29942257 Fix link missing icon 2015-03-01 14:03:14 +01:00
Laurent Destailleur
4bde7e9f51 Fix: Missing error management 2015-02-26 14:25:30 +01:00
Laurent Destailleur
41a74c62e2 Fix trigger to insert lines where called when inserting line but also
when cloning parent object, making no way to know when to use them or
not. I introduced a context to allow code to know that and do not
triggers twice.
2015-02-26 13:03:17 +01:00
Laurent Destailleur
ae8d090ebe Fix No default filter by default, we miss data 2015-02-23 11:43:38 +01:00
Laurent Destailleur
25bb6a588f Fix list of project must be restricted on opened status 2015-02-23 00:57:48 +01:00
Laurent Destailleur
c5269eb0a5 Fix: back to project page 2015-02-07 04:06:38 +01:00
Laurent Destailleur
7cc9a09f99 Fix bad order 2015-02-07 04:06:30 +01:00
Laurent Destailleur
79ac620ab5 Fix label of status 2015-02-07 01:32:21 +01:00
Laurent Destailleur
5306220e5e Fixed: Translation 2015-01-23 02:21:43 +01:00
Laurent Destailleur
b7328caa9a Fixed: Bad date for supplier orders 2015-01-22 20:40:53 +01:00
Laurent Destailleur
8267cec5a3 Fix: select if field is null 2015-01-22 20:10:25 +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
Laurent Destailleur
2f4352c759 Merge branch 'bug-1785' of https://github.com/marcosgdf/dolibarr into
marcosgdf-bug-1785

Conflicts:
	ChangeLog
2015-01-18 12:45:05 +01:00
Marcos García de La Fuente
61809ef6b5 - Fix: [ bug #1802 ] SQL error when updating a task with PostgreSQL database 2015-01-15 13:22:58 +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
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
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
Marcos García de La Fuente
5ec38d89ff Fixed [ bug #1763 ] Undefined variable $interface in Project:574 2014-12-25 22:59:57 +01:00
Marcos García de La Fuente
1f00794c98 Fixed bug which didn't show documents in auto GED when an object had '/' in its ref 2014-12-25 21:47:39 +01:00
Marcos García de La Fuente
78307a748d Corrected confusing table header in task list 2014-12-23 15:56:29 +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
Marcos García de La Fuente
db30186386 Fix: [ bug #1731 ] Can't use quick navigation on project tasks secondary tabs 2014-12-22 22:52:43 +01:00
Laurent Destailleur
31f782ffe9 Fix: Several fixes into tasks and time spent management 2014-12-21 14:58:18 +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
6f43206331 Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 2014-12-18 15:42:44 +01:00
Florian HENRY
c209d16881 [ bug #1749 ] Undefined $mailchimp 2014-12-18 15:42:28 +01:00