lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
69,558 Commits 43 Branches 150 Tags 886 MiB
8.0
Commit Graph

215 Commits

Author SHA1 Message Date
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