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

223 Commits

Author SHA1 Message Date
Laurent Destailleur
26a9999fbf Support of preview for pdf with several pages 2017-04-12 11:38:55 +02:00
Laurent Destailleur
d975e7f442 Work on 6.0 look and feel 2017-04-01 12:46:47 +02:00
Laurent Destailleur
93687997c9 Work on 6.0 look and feel 2017-03-31 18:40:53 +02:00
Laurent Destailleur
fd3837e1d5 Merge pull request #6492 from aspangaro/6.0-donation 
NEW Add donations statistics in home statistics
 2017-03-10 12:31:46 +01:00
Laurent Destailleur
184d52525a PHP code to manage pair/impair is replaced by native CSS. 2017-03-07 22:45:22 +01:00
Alexandre SPANGARO
fd0a46c5cf New : add donations statistics in home statistics 2017-03-07 22:31:34 +01:00
Laurent Destailleur
19e60f03b9 Add MAIN_SEARCH_FORM_ON_HOME_AREAS to disable useless search forms 2017-02-21 14:17:44 +01:00
Laurent Destailleur
e58743ea5b Fix regression: Textarea to enter data was crushed. 2017-02-07 01:13:04 +01:00
Marcos García de La Fuente
a94a951a89 Little improvements to admin pages where a FREE_TEXT or a watermark constant was set 2017-02-03 19:38:33 +01:00
Laurent Destailleur
65f7de8f64 Fix css and look 5.0 2017-01-22 12:13:32 +01:00
Laurent Destailleur
d14e4dbaba Fix pagination when MAIN_DISABLE_FULL_SCANLIST is on 2017-01-15 20:49:20 +01:00
aspangaro
ab8341cc8b Presentation 2016-12-23 06:33:58 +01:00
aspangaro
eb2d85ab78 Donation : Complete work on dol_banner & Fix project selector 2016-12-20 21:39:42 +01:00
Laurent Destailleur
e50bbb05fa Fix security bugs 2016-12-18 13:04:24 +01:00
Laurent Destailleur
dce3d5d888 Merge pull request #6055 from aspangaro/5.0-p37 
Fix: Presentation of donation card
 2016-11-29 23:21:46 +01:00
Laurent Destailleur
bd8f923cee Several fixes in filter on lists 2016-11-29 22:52:16 +01:00
aspangaro
85a37eb0ba Fix: Presentation of donation card 2016-11-28 20:48:43 +01:00
Laurent Destailleur
2c9edd4205 Maxi debug on list. Fix responsive design. 2016-11-27 13:49:46 +01:00
Laurent Destailleur
16ce156631 Fix responsive design 2016-11-25 18:32:52 +01:00
Laurent Destailleur
ab269bd7a6 Better responsive 2016-11-11 01:15:41 +01:00
Laurent Destailleur
341e014a3d Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/don/document.php
 2016-11-08 11:36:31 +01:00
Laurent Destailleur
bb5df3beeb Fix missing tab 2016-11-07 04:02:16 +01:00
Laurent Destailleur
7d182c286c Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/install/step1.php
	htdocs/projet/tasks/time.php
 2016-10-26 10:40:03 +02:00
Laurent Destailleur
6338b04ac0 Remove call of a deprecated function 2016-10-24 11:27:39 +02:00
Rembert Oldenboom
65b986d9ec Revert "Cleanup" 
This reverts commit 070980f5a6.
 2016-10-23 17:04:21 +02:00
Rembert Oldenboom
070980f5a6 Cleanup 2016-10-23 16:59:57 +02:00
Rembert Oldenboom
9c6933a796 Fix pager 2016-10-23 16:53:45 +02:00
Laurent Destailleur
9175ff80a0 Fix download of files uploaded on donation 2016-10-16 17:25:33 +02:00
Laurent Destailleur
d27dea8320 NEW Can rename uploaded or generated files on all "documents" tabs. 2016-10-14 18:09:24 +02:00
Laurent Destailleur
6232e59fd2 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 2016-09-26 14:17:36 +02:00
Laurent Destailleur
3eaec4d4b8 Uniformise fields in tables 2016-09-23 10:55:44 +02:00
Laurent Destailleur
c6ef3778b7 FIX Creation of donation should go back on card after creation 2016-09-23 09:55:49 +02:00
Laurent Destailleur
8cfac3b5c3 FIX Several problems when using smartphone 2016-08-31 12:38:54 +02:00
aspangaro
9f40f346cb Fix: Presentation of Donations Area and add search 2016-08-26 13:23:00 +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
774e327831 Merge remote-tracking branch 'origin/3.9' into 4.0 
Conflicts:
	htdocs/comm/remx.php
	htdocs/compta/facture.php
	htdocs/langs/en_US/companies.lang
 2016-07-21 10:30:51 +02:00
Laurent Destailleur
972d998f7e Merge remote-tracking branch 'origin/3.8' into 3.9 2016-07-21 10:25:03 +02:00
Juanjo Menent
1232e25859 FIX #5474 Country_id of "Don" object is still empty 2016-07-16 20:00:55 +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
philippe grand
388cd202aa international comment for code 2016-06-17 14:19:54 +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
Laurent Destailleur
e1bec46a34 FIX The include file for action on files should not be a template file 
but an action include file.
 2016-04-02 14:16:16 +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
Laurent Destailleur
630f5a632d Revert "Corrected non-static usages of Form::selectarray function" 
This reverts commit 87cd6e1e40.
 2016-03-25 15:34:37 +01:00
Laurent Destailleur
26de415b77 Revert commit that break compatibility of 100% of modules 2016-03-25 15:24:57 +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
Juanjo Menent
5fabb7b1e1 Merge pull request #4865 from aspangaro/3.9-p20 
FIX: Donation || Don't show project icon if fk_project is empty
 2016-03-21 20:12:32 +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
Marcos García de La Fuente
4d78932fe8 NEW Converted Form::textwithtooltip and Form::textwithpicto to static functions 2016-03-20 14:15:21 +01:00
Marcos García de La Fuente
87cd6e1e40 Corrected non-static usages of Form::selectarray function 2016-03-20 14:15:17 +01:00
Laurent Destailleur
3a58613e45 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/listbyyear.php
	htdocs/accountancy/journal/bankjournal.php
	htdocs/compta/facture/list.php
	htdocs/filefunc.inc.php
	htdocs/fourn/facture/list.php
	htdocs/install/mysql/migration/3.9.0-4.0.0.sql
	htdocs/projet/activity/index.php
 2016-03-02 23:40:11 +01:00
Laurent Destailleur
a26f880843 Fix missing declarion of form 
Fix by adding MAIN_USE_OLD_SEARCH_FORM to restore a way for backward
compatibility
Fix to have delay for payment term at least 1 day (to avoid immediate
warning after creation of an invoice)
 2016-03-01 00:59:42 +01:00
Laurent Destailleur
a4628e4bd1 Clean deprecated files 2016-02-16 00:41:30 +01:00
Laurent Destailleur
9da0164d90 Uniformize code for lists 2016-02-07 15:50:48 +01:00
Laurent Destailleur
8653e7fa5c Merge remote-tracking branch 'origin/3.9' into develop 2016-01-10 00:12:51 +01:00
Laurent Destailleur
a0d11e157b Fix select2 component go over parent container so we introduce option to 
deal this.
 2016-01-08 23:17:45 +01:00
aspangaro
e0da56bcd0 Accountancy Add a list to select accounting account on donation admin 2015-12-26 05:56:14 +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
Laurent Destailleur
a2ae9b9cfc Fix forget password page must have a different title then login page 
Fix Missing translations
 2015-12-21 00:47:44 +01:00
Laurent Destailleur
9973315a07 Fix we muste have ($limit = $conf->liste_limite; $offset = $limit * 
$page) and not ($offset = $conf->liste_limite * $page).
In a future $limit that could be overwrite from search post form.
 2015-12-16 19:38:40 +01:00
philippe grand
2cd49043a6 [Qual] Close database handler should be after Footer 2015-12-11 19:37:12 +01:00
Laurent Destailleur
374480043e Add maxwidth300 on combo list for users and sale representatives 2015-12-06 00:37:58 +01:00
Laurent Destailleur
88e76dcf64 Fix utf8 encoded twice 2015-11-28 14:40:23 +01:00
aspangaro
5bed70b04e New: Donation complete cerfa 11580*03 Fr - Thanks Benoit21 2015-11-22 21:31:05 +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
Laurent Destailleur
3ce147ccc1 Use new architecture for quick search for the account area. 2015-10-17 02:41:09 +02:00
Laurent Destailleur
d1d6c72d7d NEW Uniformize way of working for search filters. One filter per object. 2015-10-16 22:21:26 +02:00
frederic34
f2d7523091 Optioncss 2015-10-04 12:31:32 +02:00
frederic34
9a021e6de4 Optioncss not kept in list 2015-10-04 10:45:57 +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
Juanjo Menent
c726afe3bc Merge pull request #3592 from GPCsolutions/select_users 
[Qual] Replaced deprecated select_users()
 2015-09-26 08:44:34 +02:00
Raphaël Doursenaud
b0b552c378 [Qual] Replaced deprecated select_users() 2015-09-24 20:32:35 +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
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
aspangaro
7539ad88fa Debug 2015-06-18 06:30:48 +02:00
aspangaro
1d1f19b976 NEW: Add a tab document in donation card 2015-06-08 21:28:32 +02:00
Laurent Destailleur
df60754e52 Merge pull request #2708 from GPCsolutions/deprecated 
Deprecated
 2015-06-05 15:44:08 +02:00
Laurent Destailleur
a605040eac Merge pull request #2947 from aspangaro/develop-patch24 
NEW Forms are using the tab look, even in creation mode
 2015-06-05 09:34:52 +02:00
Laurent Destailleur
a1391ba8b7 Merge pull request #2959 from aspangaro/develop-patch22 
Fix: wrong file & problem to install model
 2015-06-05 09:07:29 +02:00
aspangaro
fc5ea9f20f Fix: wrong file & problem to install model 2015-06-04 21:14:30 +02:00
aspangaro
eb5dedab1a NEW Forms are using the tab look, even in creation mode 2015-06-04 06:40:53 +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
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
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
Laurent Destailleur
995a2c127d Working on finishing of look 2015-05-22 15:29:19 +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
Juanjo Menent
c5101ae5ea Code fixes 2015-05-07 20:07:47 +02:00
jfefe
c905f88498 Change generic and setup image title 2015-04-18 23:13:48 +02:00
Frédéric FRANCE
8d7fb7b0f6 Travis Fix don.class.php 2015-04-02 18:48:47 +02:00
Laurent Destailleur
fcb70bc193 Merge pull request #2528 from frederic34/patch-16 
Update card.php
 2015-04-02 11:46:59 +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
Frédéric FRANCE
dc89e36583 Update card.php 2015-04-01 21:12:08 +02:00
Laurent Destailleur
63ec6febec Merge pull request #2502 from frederic34/patch-7 
Travis Fix don.class.php
 2015-03-30 02:00:26 +02:00
aspangaro
c22a563422 New: Add management for accounting account in admin donation & correct bugs 2015-03-29 21:04:20 +02:00
Frédéric FRANCE
6c26063fc8 Travis Fix don.clss.php 2015-03-29 18:29:09 +02:00
aspangaro
96b7cac93f Delete useless line 2015-03-29 14:30:43 +02:00
aspangaro
ed493b651b Icons & fr_FR options not show 2015-03-29 14:29:53 +02:00
aspangaro
c733249c75 Don Remove old file 2015-03-29 09:23:39 +02:00
aspangaro
ce6df7c022 Debug 2015-03-29 09:20:32 +02:00
aspangaro
6a0916b3fa Correct path 2015-03-26 21:03:56 +01:00
aspangaro
059bb40345 Debug 2015-03-26 20:43:34 +01:00
aspangaro
2b2b43afb6 Dir "Don" 2015-03-25 22:37:14 +01:00