lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
105,843 Commits 43 Branches 150 Tags 886 MiB
87f05067ca
Commit Graph

418 Commits

Author SHA1 Message Date
Frédéric FRANCE
850ac34020
mark non camelCaps function 2018-08-13 17:26:32 +02:00
Frédéric FRANCE
6113b536a0
remove superfluous spaces 2018-08-12 19:59:39 +02:00
Philippe GRAND
094fc6b699 Standardize 2018-08-06 11:53:33 +02:00
Philippe GRAND
948647f3f9 comment translation 2018-08-04 14:17:51 +02:00
Juanjo Menent
37a9a2df56
Merge pull request #9167 from frederic34/include 
Include and co are statements
 2018-08-02 11:03:44 +02:00
Juanjo Menent
f93519bc2e
Merge pull request #9155 from frederic34/patch-19 
Update element_resource.php
 2018-08-02 10:54:30 +02:00
Juanjo Menent
82bdbd6f6e
Merge pull request #9151 from frederic34/patch-11 
Update card.php
 2018-08-02 10:50:05 +02:00
Philippe GRAND
4eacad52f2 Clean and update code 2018-07-27 10:06:56 +02:00
Frédéric FRANCE
a0a5d33641
test include 2018-07-26 17:30:53 +02:00
Frédéric FRANCE
cddb82f9be
Update element_resource.php 2018-07-25 10:11:44 +02:00
Frédéric FRANCE
cac596037f
Update card.php 2018-07-25 09:50:04 +02:00
Laurent Destailleur
f3b7bc53bd Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/core/tpl/extrafields_list_print_fields.tpl.php
 2018-07-15 20:16:08 +02:00
Inovea Conseil
c4513a755d Fix extrafields resource 2018-06-28 16:39:37 +02:00
Laurent Destailleur
4a5fd35e11 Look and feel v8 2018-06-13 22:57:41 +02:00
Philippe GRAND
5021c7a556 clean and update code 2018-06-10 18:29:04 +02:00
Laurent Destailleur
87d073b5cd Fix conflict with external ticketsup module 2018-06-04 21:49:29 +02:00
Laurent Destailleur
54023d1029
Update list.php 2018-06-04 13:42:30 +02:00
bgenere
67830a7d04 FIX extrafields display properly in list for Resource module 2018-05-30 17:09:24 +02:00
Frédéric FRANCE
f53f7bbf40
loadlangs 2018-05-26 18:41:16 +02:00
Laurent Destailleur
bbfc4a3e17 NEW Look and feel v8 - Show Picto "+" on all links "Add record" 2018-04-18 03:26:15 +02:00
Laurent Destailleur
8fbde88872 Look and feel v8 2018-04-15 17:37:49 +02:00
Laurent Destailleur
be965bdbab Clean code 2018-04-13 13:28:48 +02:00
Laurent Destailleur
1521b0595b Clean code 2018-04-13 11:03:03 +02:00
All-3kcis
880fa55dd5 display user-friendly filesize 2018-04-12 15:29:22 +02:00
Laurent Destailleur
7108f68db9 Remove old deprecated hook insertExtraFields. Triggers must be used for 
action on CRUD events.
 2018-04-10 12:03:01 +02:00
Laurent Destailleur
9d9f3ddf85
Merge pull request #8502 from ATM-Marc/NEW_create_from_list 
NEW: generalize use of button to create new element from list
 2018-04-05 16:40:15 +02:00
Marc de Lima Lucio
c2d3e2a701 NEW: generalize button to create object from list, for the remaining lists 2018-04-03 15:28:12 +02:00
Laurent Destailleur
43f8834b28 Uniformize code with the new module builder framework 2018-03-31 18:48:27 +02:00
Laurent Destailleur
b4446764f8 Clean code of deprecated usage 2018-02-21 14:48:25 +01:00
Laurent Destailleur
c4130730cb Clean code around fetch_optionals() 2018-02-20 19:38:18 +01:00
Laurent Destailleur
930d58ab96 Fix import supplier product price vat 2018-02-06 10:03:06 +01:00
florian HENRY
94285ae494 factorization of extrafeild into list 2017-11-27 15:24:29 +01:00
Ion
6428c2157c Add country to resource 2017-11-23 00:26:25 +01:00
Laurent Destailleur
b405a877b9 Use automcomplete on resource combo list 2017-11-22 14:47:35 +01:00
Laurent Destailleur
adce4b5b7b Debug multi contact on event. 
Prepare also code to manage properties of attendees of event
 2017-11-22 14:42:47 +01:00
Laurent Destailleur
aa91b9075a Fix cancel button 2017-11-22 11:54:02 +01:00
Laurent Destailleur
d2b3fc5813
Merge pull request #7849 from IonAgorria/resources-card 
NEW: Merge resource/add.php to resource/card.php
 2017-11-22 11:33:56 +01:00
Ion
7c6622f5b3 Merge resource/add.php to resource/card.php 2017-11-21 20:12:55 +01:00
Laurent Destailleur
4ad0d5df43 Fix scrutinizer issues 2017-11-19 16:55:28 +01:00
Laurent Destailleur
c527189088 Standardize page name 2017-11-16 12:18:25 +01:00
Laurent Destailleur
2668b80599 Standardize code 2017-11-12 14:21:34 +01:00
Laurent Destailleur
836f6bf3c9 Fix search filter when using extrafields 'links' 2017-11-12 12:39:23 +01:00
Laurent Destailleur
19a5780f7f Clean code 2017-10-20 23:49:20 +02:00
Laurent Destailleur
0e15aef44f CSS 2017-09-30 00:30:58 +02:00
Laurent Destailleur
c9e9f60f8f Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
 2017-09-25 19:55:52 +02:00
Laurent Destailleur
934edd9f5a Merge branch 'develop' into 6.0-api 2017-09-24 22:01:07 +02:00
florian HENRY
cafcbe03e1 agin fix list ressource 2017-09-21 12:02:45 +02:00
florian HENRY
5240217144 fix again resource list 2017-09-21 11:36:50 +02:00
florian HENRY
03ffbe55ce fix ressource list 2017-09-21 11:34:19 +02:00
Laurent Destailleur
8773a6860f Fix HTML5 use of <br> is preferred to <br /> 2017-09-15 23:49:04 +02:00
Laurent Destailleur
5e34b121dd Add more robust php unit to detect not escaped sql. Fix not escaped sql 2017-09-15 15:41:07 +02:00
Laurent Destailleur
0873260b8a USe second parameter in GETPOST 2017-09-15 10:50:50 +02:00
Laurent Destailleur
bde293af22 Fix filter on extrafield with type sellist 2017-09-07 15:34:25 +02:00
Laurent Destailleur
c108f11c01 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 
Conflicts:
	build/makepack-dolibarr.pl
	htdocs/compta/bank/index.php
 2017-09-03 00:58:45 +02:00
Regis Houssin
45136de664 Fix: documents dir not rename and delete 2017-08-30 11:26:48 +02:00
Laurent Destailleur
f375c41950 Update card.php 2017-08-10 13:47:44 +02:00
John
76bee57553 Fix Add doaction hook 2017-08-07 15:49:17 +02:00
John
d791476708 Fix doaction call 2017-08-07 15:47:55 +02:00
Laurent Destailleur
5b1f5b0f20 Fix translation done twice into field title of array 2017-08-02 13:31:53 +02:00
Laurent Destailleur
2870798d07 Fix remove warnings 2017-07-13 00:35:10 +02:00
Laurent Destailleur
c1e747fa39 Look and feel v6 2017-07-04 13:05:02 +02:00
Laurent Destailleur
bb2d27280b Fix sort link must be disabled for computed field 2017-06-19 14:31:08 +02:00
Laurent Destailleur
e93cefbbf0 FIX #6985 2017-06-11 10:37:58 +02:00
Laurent Destailleur
b441c62e1d Fix syntax error 2017-06-08 14:55:12 +02:00
Laurent Destailleur
b1f93ccb0c Fix security 2017-06-08 14:33:46 +02:00
Laurent Destailleur
543630e487 Fix missing count of nb of columns into lists 2017-06-08 14:14:06 +02:00
Regis Houssin
2b36135641 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_mc
 2017-06-07 20:14:03 +02:00
Laurent Destailleur
1820649175 Maxi debug of v6 2017-06-07 19:28:31 +02:00
Regis Houssin
bfd6116e5b Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_mc 2017-06-06 15:03:36 +02:00
Laurent Destailleur
02b5d9e6f7 FIX #6945 2017-06-06 10:53:53 +02:00
Regis Houssin
5c5663c5ae New: getEntity function use true $shared value by default 2017-05-30 18:50:54 +02:00
Laurent Destailleur
e667d72547 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	dev/skeletons/build_class_from_table.php
	htdocs/compta/facture.php
	htdocs/core/class/html.form.class.php
 2017-05-29 10:41:51 +02:00
Laurent Destailleur
5ebe711665 Look and feel v6 2017-05-23 13:38:48 +02:00
arnaud
8781a19e0e FIX pagination on resources 2017-05-23 12:22:53 +02:00
Laurent Destailleur
b3dc73e611 Look and feel v6 2017-05-21 02:43:51 +02:00
Alexandre SPANGARO
93554b7e30 Typo searchpicto 2017-05-14 21:06:33 +02:00
Laurent Destailleur
39ebaec064 Replace usage of $bc[$var] with class="oddeven" 2017-04-14 11:22:48 +02:00
Laurent Destailleur
26a9999fbf Support of preview for pdf with several pages 2017-04-12 11:38:55 +02:00
Laurent Destailleur
be439f6252 Work on look and feel v6 2017-04-07 16:16:44 +02:00
Laurent Destailleur
d99b0461c7 Extrafields multilanguage support. 2017-04-03 10:56:28 +02:00
Laurent Destailleur
01a74a8d23 Work on 6.0 look and feel 2017-03-31 17:41:20 +02:00
Laurent Destailleur
da1427ef54 Work on 6.0 look and feel 2017-03-30 16:10:08 +02:00
Laurent Destailleur
e416ea275e Work on 6.0 look and feel 2017-03-28 21:04:38 +02:00
Laurent Destailleur
b5b0eba470 Several enhancement for 6.0 2017-03-28 12:47:48 +02:00
Laurent Destailleur
fb88eaf2a4 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
 2017-02-23 02:55:50 +01:00
Laurent Destailleur
a79903a2fc Fix responsive design 2017-02-23 01:29:35 +01:00
Laurent Destailleur
92d9eb3c5d Several fix for a better management of #6424 2017-02-22 17:46:54 +01:00
florian HENRY
deceeea8ff fix extrafield list of fileds 2017-01-26 15:44:09 +01:00
florian HENRY
32ebe8f4d7 fix : ressource extrafield in list 2017-01-26 14:38:49 +01:00
Laurent Destailleur
43942e6ea2 Fix css and fix navigation on resource tab. 2016-12-23 13:04:46 +01:00
Laurent Destailleur
10c00d37b5 Complete use of dol_banner 2016-12-09 15:59:31 +01:00
Laurent Destailleur
2c9edd4205 Maxi debug on list. Fix responsive design. 2016-11-27 13:49:46 +01:00
florian HENRY
54a154fa4f NEW : Add ressource extrafields 2016-10-19 22:14:51 +02:00
Laurent Destailleur
af28a67803 Uniformize look using dol_banner 2016-09-19 10:43:30 +02:00
florian HENRY
137f1c4e4f Merge branch '4.0' of https://github.com/Dolibarr/dolibarr.git into 4.0 
Conflicts:
	htdocs/resource/class/dolresource.class.php
 2016-08-18 08:49:54 +02:00
Laurent Destailleur
fead7967f2 Merge remote-tracking branch 'origin/3.9' into 4.0 
Conflicts:
	htdocs/commande/list.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/extrafields.class.php
	htdocs/resource/class/resource.class.php
 2016-08-17 16:55:39 +02:00
florian HENRY
f7bb2483d8 fix ressource for PGSQL 2016-08-17 14:53:51 +02:00
florian HENRY
ddc480b6c9 other fix for PgSQL and style 2016-08-17 14:51:25 +02:00
florian HENRY
63c5425991 another fix for Ressource module in PgSQL 2016-08-17 14:46:15 +02:00
florian HENRY
5c51cb0f29 FIX : PgSQL Module Ressource list crash #5637 2016-08-17 14:40:05 +02:00
aspangaro
b7420372b7 Uniformize presentation, add button cancel everywhere 2016-08-12 22:53:30 +02:00
Laurent Destailleur
fdfe333f69 Fix strict sql 2016-08-02 13:10:09 +02:00
Laurent Destailleur
c242e53db6 FIX #5523 2016-07-27 19:23:40 +02:00
Sergio Sanchis Climent
7481cfc1a3 FIX #5519 2016-07-26 16:35:54 +02:00
Laurent Destailleur
c7065cc3b8 Minor esthetic fixes 2016-06-07 13:15:38 +02:00
Laurent Destailleur
52fefc2d02 Debug module resource 2016-06-06 13:14:05 +02:00
Laurent Destailleur
9b6e5196ea Debug module resource. Filter on agenda. 2016-06-06 13:05:36 +02:00
Laurent Destailleur
681249de8a Debug module resource 2016-06-06 12:29:15 +02:00
Laurent Destailleur
9c3b9a8494 NEW: Link on user in leave context reach to leave tab. 2016-05-19 13:25:16 +02:00
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
aspangaro
d69f066735 QUAL: Traduce terms + remove <center> 2015-03-15 14:04:07 +01:00
frederic34
f4161b457b Add dol_escape_htmltag and start to adapt boxes 2015-01-22 00:23:55 +01:00
frederic34
1b0dd671b3 Add tooltip in getNomUrl link 2015-01-20 21:40:33 +01:00
Laurent Destailleur
e220ce5a82 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/comm/card.php
	htdocs/comm/propal.php
	htdocs/commande/card.php
	htdocs/compta/facture.php
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/core/class/html.formcompany.class.php
	htdocs/custom/.gitignore
	htdocs/expedition/card.php
	htdocs/fourn/card.php
	htdocs/product/fournisseurs.php
 2015-01-18 18:44:22 +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
7f59cf9194 Fix: [ bug #1787 ] Incorrect behaviour of doActions hook 2015-01-17 19:28:27 +01:00
Laurent Destailleur
e24a668c52 Merge pull request #2225 from frederic34/psr2 
Psr2
 2015-01-09 22:53:06 +01:00
frederic34
60661ae948 Add some "classfortooltip" 2015-01-09 00:07:54 +01:00
frederic34
73fda2cb86 WIP PSR2 2015-01-08 18:36:03 +01:00
Laurent Destailleur
0459477097 Fix: Miscellaneous fixes for multicompany 2014-12-06 14:41:56 +01:00
aspangaro
aa8c165f06 Presentation 2014-11-23 21:03:34 +01:00
Laurent Destailleur
445f696d28 Fix: Pb of object with wrong type. 2014-11-15 18:24:38 +01:00
Laurent Destailleur
d98bfb1d8d Fix: Bugs reported by scrutinizer 2014-11-15 15:19:37 +01:00
Laurent Destailleur
5e0946bdc2 Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	htdocs/adherents/class/adherent.class.php
	htdocs/adherents/fiche.php
	htdocs/core/lib/date.lib.php
	htdocs/langs/fr_FR/bills.lang
	htdocs/resource/class/resource.class.php
 2014-11-05 16:37:07 +01:00
aspangaro
57f49ec5d4 GPLv3 2014-10-30 20:41:08 +01:00
jfefe
e370ffb2d4 Bad function call 2014-10-30 01:33:39 +01:00
Laurent Destailleur
a99bd1c835 Fix: Fix permission on files. 2014-10-17 15:30:38 +02:00
Regis Houssin
a2446e51db New: add context "globalcard" for declaring only once all cards 2014-10-06 07:20:58 +02:00
Laurent Destailleur
ec95aacd52 Uniformize code for error reporting after a hook. 2014-09-28 03:41:32 +02:00
Laurent Destailleur
14ab409ca9 Merge remote-tracking branch 'origin/3.6' into develop 
Conflicts:
	htdocs/admin/stock.php
	htdocs/admin/system/index.php
	htdocs/comm/fiche.php
	htdocs/core/lib/admin.lib.php
	htdocs/core/lib/holiday.lib.php
	htdocs/core/lib/pdf.lib.php
	htdocs/core/login/functions_forceuser.php
	htdocs/core/login/functions_http.php
	htdocs/core/menus/standard/auguria.lib.php
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
	htdocs/filefunc.inc.php
	htdocs/holiday/define_holiday.php
	htdocs/opensurvey/fonctions.php
	htdocs/societe/canvas/actions_card_common.class.php
	test/phpunit/CompanyBankAccountTest.php
	test/phpunit/ExportTest.php
	test/phpunit/FactureTest.php
	test/phpunit/FunctionsLibTest.php
	test/phpunit/PropalTest.php
	test/phpunit/SocieteTest.php
	test/phpunit/WebservicesInvoicesTest.php
	test/phpunit/WebservicesThirdpartyTest.php
 2014-09-28 02:14:32 +02:00
Laurent Destailleur
e8b7c9c6bd Fix: doxygen 2014-09-27 16:00:11 +02:00
Laurent Destailleur
342e26f679 Merge 2014-09-07 12:22:04 +02:00
jfefe
71afc4adb0 Fix : missing actions for resource element 2014-08-30 11:11:32 +02:00
jfefe
2c68317864 Fix : bad sql request when linking resource to an element 2014-08-30 10:23:58 +02:00
Laurent Destailleur
6226d39cda Fix: Pb when option javascript disabled. 2014-07-29 19:45:48 +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
KreizIT
ca97c0bef3 Refactor: RESOURCE_* trigger 2014-07-11 16:06:06 +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
9fbd7806f0 More substitutions 2014-06-12 11:31:53 +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
0027dc30f5 Fix: Modules into core should never, by definition, activate hooks 
(hooks are architecture solution for external module)
 2014-05-14 12:14:18 +02:00
jfefe
d69b7fb1dc Fix : bad redirect after resource deleting 2014-05-11 12:42:21 +02:00
jfefe
e7dfdd27b1 Fix: filter on POST value too restrictive 2014-05-11 12:33:49 +02:00
jfefe
8cba0fbcbe Remove reference to external module 2014-05-11 12:33:20 +02:00
jfefe
04161084cf Fix : missing method to delete linked resource 2014-05-11 12:26:57 +02:00
jfefe
e9453437f1 New : delete resource 2014-05-11 12:12:17 +02:00
jfefe
12aafd219d Fix : update linked resource 2014-05-11 10:19:38 +02:00
jfefe
872b2c229e Fix : delete linked resource on an element 2014-05-11 00:49:01 +02:00
jfefe
ba1fc07037 Uniformize langage files 2014-05-11 00:38:03 +02:00
jfefe
e6bcf7c408 Missing langage file 2014-05-11 00:27:09 +02:00
jfefe
225c7ae07b New : link resource with any element 
With tpl system, external modules can declare resource with hook getElementResources
 2014-05-10 22:07:54 +02:00
Jean-François Ferry
8f3940aab6 Use fetch_all() method into element resource list 2014-05-10 22:07:54 +02:00
Jean-François Ferry
a76fef5f35 Work on resource list / navbar into card 2014-05-10 22:07:13 +02:00
Jean-François Ferry
c2081b299f Missing resource type select list into add form 2014-05-10 22:07:13 +02:00
Jean-François Ferry
e4962e9efd Add resource card 2014-05-10 22:07:13 +02:00
Jean-François Ferry
6a9bf009f2 Clean code 2014-05-10 22:07:13 +02:00
Jean-François Ferry
5f74b86b18 Add dictionary to define type of resources 2014-05-10 22:07:12 +02:00
Jean-François Ferry
3e522b1f54 Add picto 2014-05-10 22:07:12 +02:00
Jean-François Ferry
eb2c274525 Add method to load type code from dictionary 2014-05-10 22:07:12 +02:00
Jean-François Ferry
04aa373282 Add fetch and update method for resource 2014-05-10 22:07:12 +02:00
Jean-François Ferry
c42697dd78 New : can add new resource in database 2014-05-10 22:07:12 +02:00
Jean-François Ferry
3a866bd611 Fix: bad perm for resource module 2014-05-10 22:06:22 +02:00
Jean-François Ferry
c04812cd15 Fix: bad lang file 2014-05-10 22:06:22 +02:00
Jean-François Ferry
1ad3405ee8 Qual : codesniffer 2014-05-10 22:06:22 +02:00
Jean-François Ferry
a2bfcfae31 Qual : codesniffer 2014-05-10 22:06:22 +02:00
Jean-François Ferry
fdb50ab116 Move generic function from commonobject.class to functions2.lib.php (work on resource module) 2014-05-10 22:06:22 +02:00
Jean-François Ferry
bb58bed930 In commonoobject add method for adding resource to an element 2014-05-10 22:03:05 +02:00
Jean-François Ferry
71c44d82ab Move resource module functions into commonobject : 
- new method to get an array with object properties
- new method to fetch an object only with id and element_type
 2014-05-10 22:03:05 +02:00
Jean-François Ferry
d9c567ca3d Prepare structure for upstream merge 2014-05-10 22:03:05 +02:00