Laurent Destailleur
|
a258370f8a
|
Prepare code for generic solution where all path are forged using
get_exdir.
|
2015-05-18 22:25:51 +02:00 |
|
Laurent Destailleur
|
6d95de48c2
|
Css fixes
|
2015-05-14 20:49:22 +02:00 |
|
Laurent Destailleur
|
100fa1067e
|
Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
htdocs/compta/bank/virement.php
htdocs/compta/facture/impayees.php
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/core/menus/standard/eldy.lib.php
htdocs/core/modules/modProjet.class.php
htdocs/install/mysql/migration/3.6.0-3.7.0.sql
htdocs/langs/en_GB/admin.lang
htdocs/langs/es_AR/orders.lang
htdocs/langs/es_AR/trips.lang
htdocs/langs/es_CO/admin.lang
htdocs/langs/es_CO/orders.lang
htdocs/langs/es_CO/trips.lang
htdocs/langs/fr_FR/admin.lang
htdocs/langs/fr_FR/main.lang
htdocs/langs/pl_PL/interventions.lang
htdocs/langs/pt_BR/trips.lang
htdocs/langs/ro_RO/productbatch.lang
htdocs/langs/ro_RO/trips.lang
htdocs/main.inc.php
htdocs/projet/element.php
|
2015-04-22 17:57:57 +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 |
|
Laurent Destailleur
|
ae103e34b8
|
Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
build/debian/changelog
htdocs/compta/facture.php
htdocs/core/lib/price.lib.php
htdocs/install/mysql/migration/3.6.0-3.7.0.sql
htdocs/opensurvey/public/studs.php
htdocs/projet/element.php
|
2015-04-13 13:08:46 +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 |
|
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
|
e827b1b9cd
|
Merge pull request #2529 from aspangaro/develop-don
NEW better integration in project for donation module
|
2015-04-02 11:42:15 +02:00 |
|
aspangaro
|
115777f05d
|
New: Module project - Elements - Show detail of amounts with a minus when the amount decrease margin
|
2015-04-02 06:54:04 +02:00 |
|
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 |
|