Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-01-06 17:13:03 +01:00
Code Issues Packages Projects Releases Wiki Activity
56,821 Commits 37 Branches 191 Tags
e83bb0f50c1b0b51a587a423183563f07f46a982
Commit Graph

49176 Commits

Author SHA1 Message Date
BENKE Charlie
c23919c51a change left menu name of categorie 
It is impossible to add sub-menus to other categories left menus if not...
 2016-11-30 09:41:33 +01:00
Laurent Destailleur
d86c3931e2 Fix translation 2016-11-30 09:09:09 +01:00
bgenere
751651c4d4 Merge remote-tracking branch 'upstream/develop' into develop 2016-11-30 08:37:57 +01:00
Laurent Destailleur
8fb5eca0ef Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-11-29 23:56:52 +01:00
Laurent Destailleur
874bb488da Fix bad comment 2016-11-29 23:42:56 +01:00
Laurent Destailleur
0ec9dd9b88 Merge pull request #6048 from ozit/patch-1 
an extra comma at the end
 2016-11-29 23:37:41 +01:00
Laurent Destailleur
592b9d0b20 Merge pull request #6061 from mrsof/patch-6 
Fix: Product barcode generation in edit mode
 2016-11-29 23:34:18 +01:00
Laurent Destailleur
ef029dc602 Merge pull request #6057 from atm-alexis/5.0_FIX_typhon_model 
FIX column too small, header on 2 lines
 2016-11-29 23:23:19 +01:00
Laurent Destailleur
4bff869507 Merge pull request #6056 from aspangaro/5.0-p38 
Presentation of social contribution
 2016-11-29 23:22:58 +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
6624630cd1 Merge pull request #6052 from atm-alexis/FIX_bad_date_for_warning_check 
FIX date for warning test might be the same as in propal list
 2016-11-29 23:20:44 +01:00
Laurent Destailleur
52205241e3 Merge pull request #6046 from defrance/patch-47 
FIX Enabling intervention to process
 2016-11-29 23:05:05 +01:00
Laurent Destailleur
401ce91883 Merge pull request #6045 from aspangaro/5.0-p36 
Fix: Expense report list return empty date field
 2016-11-29 23:04:16 +01:00
Laurent Destailleur
22e2c3ed29 Fix missing pagination on supplier payments 2016-11-29 23:02:37 +01:00
Laurent Destailleur
bd8f923cee Several fixes in filter on lists 2016-11-29 22:52:16 +01:00
Laurent Destailleur
711961ed18 Fix missing translation 2016-11-29 17:24:40 +01:00
bgenere
2e45a8e8b3 Merge remote-tracking branch 'upstream/develop' into develop 2016-11-29 17:15:00 +01:00
Laurent Destailleur
f6734be1a1 Fix security hole. Add quick and fast hack to fix it 2016-11-29 17:08:44 +01:00
Laurent Destailleur
9ff38ee136 Add missing currency for madagascar 2016-11-29 12:28:17 +01:00
Sof
e05de2942b Fix: update informations 2016-11-29 12:19:01 +01:00
Sof
53d1dbf4b9 Fix: Codebar suggestion in edit mode 2016-11-29 12:06:58 +01:00
Laurent Destailleur
39c2088aa5 Fix constant 2016-11-29 11:23:15 +01:00
Laurent Destailleur
c33e486828 Fix order of option and picto 2016-11-29 10:42:10 +01:00
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
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