Laurent Destailleur
d083ad9382
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/product/class/product.class.php
htdocs/resource/class/html.formresource.class.php
2016-05-17 18:21:22 +02:00
Laurent Destailleur
668df6cb7d
Debug resource module
2016-05-17 10:51:13 +02:00
Laurent Destailleur
63d0710842
FIX Creation of the second ressource type fails.
2016-05-17 10:44:30 +02:00
Ion Agorria
788d499bf6
Change resource type to dolresource in class
2016-05-11 18:50:02 +02:00
Laurent Destailleur
19162fc8d5
Merge branch 'patch-1' of https://github.com/PeartreeG/dolibarr into
...
PeartreeG-patch-1
Conflicts:
htdocs/install/mysql/migration/3.9.0-4.0.0.sql
htdocs/resource/element_resource.php
2016-04-29 18:31:11 +02:00
Laurent Destailleur
8fe799f424
Merge branch 'dol_resource' of https://github.com/aternatik/dolibarr
...
into aternatik-dol_resource
Conflicts:
dev/initdata/img/printcompany.png
htdocs/compta/bank/card.php
2016-04-29 17:51:11 +02:00
Laurent Destailleur
46fe16be0b
Merge pull request #4871 from sbechet/develop
...
Postgresql compatibility patch + cosmetic
2016-03-25 17:57:29 +01:00
Laurent Destailleur
91caea5707
Code was corrupted with very bad commits. I restore files manually.
2016-03-25 15:53:44 +01:00
Sebastien Bechet
82f74ceb38
Postgresql compatibility patch + cosmetic
2016-03-22 10:09:41 +01:00
Marcos García de La Fuente
5a046125db
Missing changes from previous commits
2016-03-20 14:24:49 +01:00
PeartreeG
ea5b8a409c
little forget...
2016-02-02 18:37:54 +01:00
PeartreeG
835c2725c5
Update element_resource.php
2016-02-02 14:14:01 +01:00
PeartreeG
6bb6e66e13
element name used to create the clas...
2016-02-02 14:05:35 +01:00
PeartreeG
62b35ffa45
add fichinter tabs on resource element link
2016-02-01 16:15:30 +01:00
PeartreeG
4e83abba30
Update element_resource.php
2016-02-01 15:40:16 +01:00
PeartreeG
f4a6945aa0
add note feature on resource module
2016-01-31 12:30:15 +01:00
PeartreeG
265f01806c
add document feature on resource modules
2016-01-31 12:27:46 +01:00
PeartreeG
c34fd7b354
add contact tabs on resource
2016-01-31 12:26:12 +01:00
jfefe
7c4a9d140b
Replace reserved keyword "Resource" by "DolResource"
...
# Conflicts:
# htdocs/resource/list.php
2016-01-21 11:26:21 +01:00
braito4
47ee8993d3
fix travis
2015-12-28 11:47:12 +01:00
braito4
07f7717b51
Fix Warning #4229 PHP7
2015-12-28 11:28:18 +01:00
philippe grand
c740a85006
[Qual] Uniformize code
2015-12-21 14:43:21 +01:00
philippe grand
8e8c6b1534
Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into develop
2015-12-21 14:22:45 +01:00
Laurent Destailleur
db7a98f0ef
Fix: When a payment mode was disabled, it was not visible on old
...
records.
Fix: init of $limit not correctly set according to 3.9 rules on most
pages.
2015-12-21 13:56:59 +01:00
philippe grand
7a33e2983d
[Qual] Uniformize code
2015-12-20 10:36:20 +01:00
Laurent Destailleur
bef971cacf
Fix ergonomy. Adding a new entry is done from left menu.
2015-12-19 03:43:45 +01:00
Laurent Destailleur
ba3c8de785
Update doc comment to make things cleaner to avoid confusion between old
...
deprecated doActions of canvas and doActions of triggers.
2015-12-17 14:01:22 +01:00
braito4
ab274ba1e3
Update list.php
...
Doble page title
2015-12-09 13:10:12 +01:00
Laurent Destailleur
ff4f1e7a5b
Debug 3.9
2015-12-05 19:20:39 +01:00
Laurent Destailleur
480a398f36
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/holiday/card.php
htdocs/resource/list.php
2015-12-03 13:06:20 +01:00
Frédéric FRANCE
e6033369a8
Update resource.class.php
2015-11-26 20:33:07 +01:00
Frédéric FRANCE
1b9039af36
Update list.php
2015-11-26 20:30:11 +01:00
Laurent Destailleur
cb3765bc92
Debug module Resource
2015-11-22 12:23:10 +01:00
philippe grand
1762b3aaa7
[Qual] Uniformize code
2015-10-17 17:09:34 +02:00
Laurent Destailleur
62792c08eb
Merge pull request #3591 from GPCsolutions/inherited
...
[Qual] Cleanup of inherited class properties
2015-09-26 11:23:59 +02:00
Raphaël Doursenaud
67ddb6c94e
[Qual] Cleanup of inherited class properties
2015-09-24 20:12:55 +02:00
Raphaël Doursenaud
631ee83745
[Qual] Replaced deprecated print_fiche_titre()
2015-09-24 18:34:58 +02:00
Raphaël Doursenaud
dabfad1529
[Qual] Replaced deprecated print_titre()
2015-09-24 18:27:13 +02:00
Laurent Destailleur
6c01403ef3
Merge branch 'resources-fixes' of https://github.com/IonAgorria/dolibarr
...
into IonAgorria-resources-fixes
Conflicts:
htdocs/core/tpl/resource_add.tpl.php
htdocs/resource/element_resource.php
2015-08-14 17:53:52 +02:00
Laurent Destailleur
2abb90713e
Fix list of resource not visible
2015-08-14 17:35:05 +02:00
Laurent Destailleur
04812bf422
Fix date not visible and label of edit button not correct
2015-08-13 03:38:23 +02:00
Ion Agorria
f3cd9da73d
Resource fixes
2015-08-12 21:48:00 +02:00
aspangaro
59e88590e0
Move my address email to new one
2015-07-15 20:30:33 +02:00
aspangaro
9d2e964b00
Fix: print_liste_field_titre('');
2015-06-26 06:23:29 +02:00
Raphaël Doursenaud
3f9270ea78
Qual: added deprecation hinting
...
Added deprecation hinting for class properties
Added syslog warning events for deprecated functions, methods and/or their parameters
Added hinting for some constants
2015-06-01 11:00:11 +02:00
Laurent Destailleur
49f2157f2d
Little debug of module resource
2015-05-31 02:05:39 +02:00
Laurent Destailleur
5e773d4cb6
Work on finishing of style
2015-05-31 01:06:51 +02:00
aspangaro
58e942681d
NEW Forms are using the tab look, even in creation mode
2015-05-20 07:03:17 +02:00
Raphaël Doursenaud
5d2f081152
[Qual] Fixed HTML select form selected attribute
...
Dolibarr uses HTML 4.01 or HTML5 doctypes.
The select form selected attribute should not have a value.
2015-05-07 14:21:14 +02:00
jfefe
f2e19f2326
Fix: error when deleting resource
2015-04-18 18:07:59 +02:00
