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

56893 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
f267273251 Missing translation 2016-11-29 10:38:27 +01:00
Alexis Algoud
360c952e5a FIX column too small, header on 2 lines 2016-11-29 09:50:55 +01:00
aspangaro
953feefb6a Social contribution in adaptive mode (Payment are under the information) 2016-11-29 06:43:16 +01:00
aspangaro
d73c24bb45 Social contribution in adaptive mode (Payment are under the information) 2016-11-29 06:34:20 +01:00
Laurent Destailleur
83972b39ce Complete work on dol_banner. Fix errors due to missing columns. 2016-11-28 23:58:36 +01:00
aspangaro
fc0edc3499 Uniformize presentation of social contribution - Add button cancel in create mode 2016-11-28 21:27:02 +01:00
aspangaro
85a37eb0ba Fix: Presentation of donation card 2016-11-28 20:48:43 +01:00
Laurent Destailleur
4eb397557f Debug accounting module 2016-11-28 19:30:55 +01:00
Laurent Destailleur
6e43910932 FIX Filter was wrong or lost during navigation 2016-11-28 18:38:48 +01:00
bgenere
71434d84dd Fixed display issue on import step 4 screen when import_entities_array 
is empty. also fixed an extra -> displayed.
 2016-11-28 16:44:58 +01:00
Laurent Destailleur
5e012bcc13 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 2016-11-28 16:40:57 +01:00
Laurent Destailleur
196428edf5 FIX #6051 2016-11-28 16:34:38 +01:00
Laurent Destailleur
b2ed3f3053 Fix translation 2016-11-28 16:32:14 +01:00
Alexis Algoud
950a63f121 FIX date for warning test might be the same as in propal list 2016-11-28 15:53:31 +01:00
bgenere
093942bcd7 Fixed display issue for custom modules dictionnary not displayed 
properly when blank exists in dictionnary list for core modules.
 2016-11-28 15:37:24 +01:00
bgenere
a3fbe94f7c Cleaned-up code - removed syslog entry added for debug 2016-11-28 14:30:21 +01:00
bgenere
b81a1a9a1d Code was setting ISO charset as default wich was causing an issue with 
transnoentities as this method send back UTF-8. Result was that CSV file
was generated empty (tested on Unix Ubuntu workstation).
Replaced now with $conf->file->character_set_client so it works for me
(using UTF-8 by default.
To complete the fix my feeling is that we should not force charset till
we are not writing the final result. But needs to be confirmed by a
senior Dolibarr developer.
 2016-11-28 14:23:35 +01:00
Oziel AO
2c8f2f220a an extra comma at the end 
note             text
not
  note             text,
 2016-11-28 12:29:30 +01:00
Laurent Destailleur
5e5ce0043e Debug module ECM. 2016-11-28 12:03:33 +01:00
BENKE Charlie
8002187912 Enabling ficheintertoprocess 2016-11-28 10:34:03 +01:00
aspangaro
044c4bda3b Fix: Expense report return empty date field 2016-11-28 06:53:34 +01:00
Juanjo Menent
edadc13be6 Merge remote-tracking branch 'upstream/develop' into develop 
# Conflicts:
#	htdocs/compta/facture/class/facture.class.php
 2016-11-27 21:03:29 +01:00
Laurent Destailleur
e59edca855 Fix Responsive design 2016-11-27 20:55:59 +01:00
Laurent Destailleur
ccba387691 Fix Responsive design 2016-11-27 20:18:10 +01:00
Laurent Destailleur
e52e17eec2 Fix Responsive design 2016-11-27 20:11:39 +01:00
Laurent Destailleur
604b3eff8d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-11-27 20:03:11 +01:00
Laurent Destailleur
663f7938f8 Fxi responsive design 2016-11-27 20:02:57 +01:00
Laurent Destailleur
8b569f9dfe Try a fix for #6024 2016-11-27 17:17:29 +01:00
Laurent Destailleur
ad912bed04 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0 2016-11-27 17:10:25 +01:00
Laurent Destailleur
c362e7cf2d FIX #6043 - Payment mode not visible on supplier invoice list 2016-11-27 17:10:07 +01:00
Laurent Destailleur
bf2b75f990 Merge pull request #6042 from IonAgorria/receive-trigger 
FIX: Supplier order statut is not reverted if RECEIVE trigger fails
 2016-11-27 16:27:40 +01:00
Laurent Destailleur
18a1f9033c Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/api/class/api_generic.class.php
	htdocs/api/index.php
 2016-11-27 16:25:38 +01:00
Laurent Destailleur
65951d2f1b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-11-27 16:09:30 +01:00
Laurent Destailleur
017b18d5c6 Fix #6037 #6041 2016-11-27 16:09:16 +01:00
Laurent Destailleur
ce10dc618c Merge pull request #6040 from atm-florian/DEV_thirpdarty_extrafields_export_on_contact 
FIX missing extrafields of thirdparty on contact export
 2016-11-27 15:20:14 +01:00
Laurent Destailleur
66901e8602 Merge pull request #6036 from hregis/4.0_bug 
Fix: use string instead integer
 2016-11-27 15:11:02 +01:00
Laurent Destailleur
1e647b082c Merge pull request #6034 from aternatik/api_rest_allow_post 
FIX Minor fixes for REST API
 2016-11-27 15:10:03 +01:00
Laurent Destailleur
2e5634e60f Fix responsive design 2016-11-27 14:21:23 +01:00
Laurent Destailleur
2c9edd4205 Maxi debug on list. Fix responsive design. 2016-11-27 13:49:46 +01:00
Laurent Destailleur
e4a8342aef Fix div-table-form balance on all lists (solve responsive design) 2016-11-27 11:41:10 +01:00
Ion Agorria
f7a07f2491 Supplier order statut is not reverted on RECEIVE trigger fail 2016-11-26 22:13:31 +01:00
Laurent Destailleur
60c494fd5f Missing dolibarr version in dump file 2016-11-26 17:48:06 +01:00
Laurent Destailleur
e6fb118155 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/install/mysql/migration/3.8.0-3.9.0.sql
 2016-11-26 15:52:17 +01:00
Laurent Destailleur
b63ad019ce Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 2016-11-26 15:49:11 +01:00
Laurent Destailleur
423391f12d Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-11-26 15:46:55 +01:00
Laurent Destailleur
e539842c28 Fix eatdate and selldate not correctly set. 2016-11-26 15:46:41 +01:00
Laurent Destailleur
a8c3ce4e55 FIX A form should not be inside a table. Create javascript troubles. 2016-11-26 12:21:50 +01:00
Juanjo Menent
88e6c203eb Fix #6037 Bill Orders issue 2016-11-25 23:41:47 +01:00
Laurent Destailleur
16ce156631 Fix responsive design 2016-11-25 18:32:52 +01:00
florian HENRY
8ea49d8887 add extrafields thirdparty on contact export 2016-11-25 10:55:09 +01:00