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

106 Commits

Author SHA1 Message Date
Laurent Destailleur
b81de35703 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 
Conflicts:
	htdocs/adherents/class/adherent.class.php
	htdocs/comm/propal/class/propal.class.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/compta/sociales/class/chargesociales.class.php
	htdocs/contrat/class/contrat.class.php
 2017-05-12 15:44:09 +02:00
Laurent Destailleur
419c15ee8e Fix escaping class 2017-05-12 15:28:10 +02:00
Alexandre SPANGARO
35da94bbc2 Fix : missing language file in salaries index 2017-03-24 06:38:26 +01:00
Laurent Destailleur
fc401a9c68 Fix more security fixes 2016-12-18 17:27:06 +01:00
Laurent Destailleur
6c4f15df63 Fix lot of fix in css look to match v5 rules. 2016-12-11 16:11:42 +01:00
Laurent Destailleur
2c9edd4205 Maxi debug on list. Fix responsive design. 2016-11-27 13:49:46 +01:00
Laurent Destailleur
35d80aa209 Miscellaneous fixes 2016-11-12 12:40:06 +01:00
Laurent Destailleur
93c848fcc5 Add page index for accountancy module 2016-10-06 17:43:10 +02:00
Juanjo Menent
eb23c8880d Merge pull request #5670 from aspangaro/5.0-p1 
Fix: Presentation on salaries payment index
 2016-08-31 02:07:11 +02:00
aspangaro
31a895dddc Merge remote-tracking branch 'Upstream/develop' into 5.0-p1 2016-08-29 21:21:10 +02:00
aspangaro
5eb0e4ad87 Fix: Presentation on salaries payment index 2016-08-29 21:14:11 +02:00
aspangaro
7cb4f85f6b Fix: Wrong language key 2016-08-29 07:30:39 +02:00
Laurent Destailleur
86c90ade3f Another fix on bank account missing when bank module enabled. 2016-08-11 18:41:31 +02:00
aspangaro
8ce5fcd980 Uniformize presentation salary payment 2016-08-01 07:40:05 +02:00
aspangaro
3c3df0c4f6 Fix Presentation 2016-07-29 23:52:49 +02:00
Laurent Destailleur
5db6bcd4a8 Fix contextpage lost on submitting form or sorting 2016-06-07 14:06:00 +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
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
Marcos García de La Fuente
5a046125db Missing changes from previous commits 2016-03-20 14:24:49 +01:00
Laurent Destailleur
9796b1b268 Can select number of records into lists 2016-02-16 17:43:05 +01:00
Laurent Destailleur
9da0164d90 Uniformize code for lists 2016-02-07 15:50:48 +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
Laurent Destailleur
52cd5d505e Fix several bugs on css, translation or look 2016-01-01 23:44:23 +01:00
Laurent Destailleur
ed3f0ce86b Fix totalnboflines not correctly managed 2015-12-28 00:20:48 +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
374480043e Add maxwidth300 on combo list for users and sale representatives 2015-12-06 00:37:58 +01:00
philippe grand
f308606ee1 [Qual] Uniformize code 2015-11-15 07:47:35 +01:00
aspangaro
d8f77f58d7 Salaries : Replace "label for" by the function fieldLabel & add some notes 2015-11-02 06:42:17 +01:00
philippe grand
f31ddc23aa [Qual] Uniformize code 2015-10-17 16:18:33 +02:00
frederic34
f2d7523091 Optioncss 2015-10-04 12:31:32 +02:00
frederic34
ed917ab447 Optioncss 2015-10-04 11:30:28 +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
6999ad0a4f Merge pull request #3587 from GPCsolutions/fiche_titre 
[Qual] Replaced deprecated function calls.
 2015-09-26 08:39:22 +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
aspangaro
918c323f8f Salaries : Add info card / add field datec / rename field user_creat to user_author 2015-09-23 06:37:14 +02:00
aspangaro
74e46b2de3 Salaries : Add label for accessibility 2015-09-23 05:47:49 +02:00
Laurent Destailleur
c06abac49e Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/compta/salaries/index.php
	htdocs/contact/class/contact.class.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/lib/geturl.lib.php
	htdocs/core/lib/pdf.lib.php
 2015-08-30 21:20:50 +02:00
aspangaro
aff134ab65 Fix #3289 Salaries module shows amounts with currency symbol unlike the rest of Dolibarr 2015-08-27 16:10:02 +02:00
aspangaro
59e88590e0 Move my address email to new one 2015-07-15 20:30:33 +02:00
Laurent Destailleur
c69a9996f1 Uniformize code 2015-06-30 15:12:15 +02:00
aspangaro
9d2e964b00 Fix: print_liste_field_titre(''); 2015-06-26 06:23:29 +02:00
aspangaro
0bd07b795f NEW: Add tab document on salaries payment 2015-05-28 07:33:50 +02:00
Laurent Destailleur
43b5209192 NEW Clean code into salary module, debug and add indexes 
NEW Can filter on user list and salary payments on user with naural
search.
 2015-05-13 08:57:39 +02:00
aspangaro
b35c929cad Merge remote-tracking branch 'Upstream/develop' into develop-Devcamp 2015-04-22 07:18:52 +02:00
aspangaro
560150fd1c Fixed: For salaries in bank module : missing language file & simplify thidparty column (Informations are truncated by default) 2015-04-22 07:15:17 +02:00
BENKE Charlie
51cb680f19 Create info.php 
add info tabs
 2015-04-19 13:32:59 +02:00
BENKE Charlie
a151defc4b Add tabs management 2015-04-19 13:28:51 +02:00
jfefe
22c3406498 Change title images for accountancy section 2015-04-18 23:17:47 +02:00