Laurent Destailleur
c6ef3778b7
FIX Creation of donation should go back on card after creation
2016-09-23 09:55:49 +02:00
Laurent Destailleur
bb99209b5e
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0
2016-08-01 15:06:22 +02:00
Laurent Destailleur
97dd1f4bbb
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
...
Conflicts:
htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
htdocs/filefunc.inc.php
2016-08-01 15:03:59 +02:00
Laurent Destailleur
803fe68061
Merge remote-tracking branch 'origin/3.8' into 3.9
...
Conflicts:
htdocs/compta/facture.php
htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
htdocs/filefunc.inc.php
2016-08-01 15:01:14 +02:00
aspangaro
0b7a5a4af9
Uniformize presentation donation
2016-08-01 07:34:55 +02:00
Laurent Destailleur
45e38efdfa
FIX #5473
2016-07-29 17:20:14 +02:00
Laurent Destailleur
b12bd9b070
Merge remote-tracking branch 'origin/3.9' into develop
2016-07-01 03:51:59 +02:00
Laurent Destailleur
f8b1d0d7ca
Merge remote-tracking branch 'origin/3.8' into 3.9
2016-07-01 03:51:23 +02:00
Alexis Algoud
eb9d26a9e0
FIX #5383 bad object id on don delete
2016-06-27 11:36:13 +02:00
Laurent Destailleur
8187dc2006
Fix css
2016-06-19 16:07:34 +02:00
Marcos García de La Fuente
e2c86d3fd8
NEW Removed deprecated CommonObject::client property. Please use CommonObject::thirdparty instead
2016-04-17 15:24:22 +02:00
Laurent Destailleur
5101c96223
Restore button to create object from the project view.
2016-04-04 15:25:08 +02:00
aspangaro
642d7473a8
FIX: Donation || Don't show project icon if fk_project is empty
2016-03-25 15:54:09 +01:00
Laurent Destailleur
91caea5707
Code was corrupted with very bad commits. I restore files manually.
2016-03-25 15:53:44 +01:00
Marcos García de La Fuente
89bd173c2f
NEW Rename Form::select_date to Form::selectDate and Form::form_date to Form::formDate
2016-03-21 21:51:29 +01:00
Juanjo Menent
187a04854f
Merge pull request #4862 from marcosgdf/form-selectarray2
...
Corrected non-static usages of several Form functions
2016-03-21 20:21:29 +01:00
aspangaro
8f1cbe9ed8
FIX: Donation || Don't show project icon if fk_project is empty
2016-03-21 12:59:30 +01:00
Marcos García de La Fuente
5a046125db
Missing changes from previous commits
2016-03-20 14:24:49 +01:00
philippe grand
32f420eefa
[Qual] Uniformize code
2015-11-21 05:20:08 +01:00
philippe grand
f31ddc23aa
[Qual] Uniformize code
2015-10-17 16:18:33 +02:00
Raphaël Doursenaud
631ee83745
[Qual] Replaced deprecated print_fiche_titre()
2015-09-24 18:34:58 +02:00
aspangaro
73d8f20c6b
Fix: Correct directory where the donation is generated & add the action to remove_file who are generated
2015-08-25 08:09:14 +02:00
aspangaro
9aecfda78a
Fix: Show project link
2015-07-15 21:55:09 +02:00
aspangaro
59e88590e0
Move my address email to new one
2015-07-15 20:30:33 +02:00
aspangaro
26ae9a6eb7
Fix: Donation payment type don't show in card
2015-07-15 19:54:51 +02:00
Laurent Destailleur
dd8a0b849a
NEW If module salaries is on, you can set a hourly value for tome
...
consumed by users. Each time a user enter its time consumed on a
project, a calculation is done to provide the cost for human services.
This value appears into the "Transversal view" of project.
2015-06-03 21:01:50 +02:00
Laurent Destailleur
c57693a245
Fix bad param on select box for project
2015-06-03 18:08:30 +02:00
Laurent Destailleur
01aad8516d
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/adherents/list.php
htdocs/compta/dons/card.php
htdocs/compta/dons/class/don.class.php
htdocs/contact/list.php
htdocs/contrat/list.php
htdocs/core/class/html.form.class.php
htdocs/core/lib/security.lib.php
htdocs/main.inc.php
htdocs/product/stock/massstockmove.php
htdocs/public/test/test_arrays.php
htdocs/public/test/test_forms.php
htdocs/societe/societe.php
2015-05-31 03:30:38 +02:00
aspangaro
b9bed14afe
Fix: spaces
2015-05-20 06:38:36 +02:00
Laurent Destailleur
4a70bb7acf
Work on generic usage of get_exdir.
2015-05-18 23:04:49 +02:00
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
5937cd7f70
NEW Forms are using the tab look, even in creation mode.
2015-05-13 17:53:25 +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
ce6df7c022
Debug
2015-03-29 09:20:32 +02:00
aspangaro
059bb40345
Debug
2015-03-26 20:43:34 +01:00
aspangaro
2b2b43afb6
Dir "Don"
2015-03-25 22:37:14 +01:00
