Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity
54,607 Commits 35 Branches 179 Tags 1.7 GiB
2de3d4ec7b
Commit Graph

47188 Commits

Author SHA1 Message Date
frederic34
2de3d4ec7b Merge remote branch 'upstream/develop' into charges 
Conflicts:
	htdocs/install/mysql/migration/4.0.0-5.0.0.sql
 2016-07-15 10:41:56 +02:00
Laurent Destailleur
74f28b3861 NEW Complete table llx_ecm_files with field generated_or_uploaded 2016-07-15 10:38:13 +02:00
Laurent Destailleur
409d6df067 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-07-15 10:27:34 +02:00
Laurent Destailleur
eb47ec5823 Drop another deprecated table llx_ecm_documents (replace by 
llx_ecm_files)
 2016-07-15 10:27:20 +02:00
Laurent Destailleur
7e9dbb4d2a Fix bad encoding of param 2016-07-15 10:23:53 +02:00
Laurent Destailleur
09306ba974 Drop not used table llx_document_generator (list of generators must be 
managed by submodules like are the templates of document or engines to
select emailing targets (scan of a dedicated dir)
 2016-07-15 10:23:36 +02:00
frederic34
f25ff0581c sql changes 2016-07-15 10:07:02 +02:00
frederic34
7e3978c403 sql changes 2016-07-15 10:04:04 +02:00
Laurent Destailleur
ca5c912432 Merge pull request #5370 from IonAgorria/fix-fetchline 
NEW: Add getElementProperties entry for proposal line
 2016-07-15 10:02:20 +02:00
frederic34
cf8fb5c230 Merge remote branch 'upstream/develop' into charges 2016-07-15 09:57:27 +02:00
Laurent Destailleur
52d9bbb92b Merge pull request #5345 from atm-alexis/NEW_add_element_in_referent_list 
NEW hook in element overview for a project
 2016-07-14 23:18:01 +02:00
Laurent Destailleur
da4d28ae3f Merge pull request #5359 from GPCsolutions/autoset_install 
New: Autoset port and admin user from db type
 2016-07-14 23:16:48 +02:00
Laurent Destailleur
36641533cb Merge pull request #5437 from Oeris/oeris-bookkeeping 
NEW|Display bookkeeping by accounting account
 2016-07-14 23:10:03 +02:00
Laurent Destailleur
8fcd2fd76c Merge pull request #5436 from atm-alexis/FIX_3.8_bug_4682 
FIX #4682 dol_time_plus_duree use datetime instead of strtotime
 2016-07-14 23:02:38 +02:00
Laurent Destailleur
dd7c7b9d4b Merge pull request #5467 from atm-florian/add_update_trigger 
NEW : review Propal/Order/Invoice class to be uniformize on triggers calls
 2016-07-14 23:00:11 +02:00
Laurent Destailleur
7d73c45208 Merge pull request #5462 from defrance/patch-10 
Add : new param accounting export
 2016-07-14 20:09:48 +02:00
Laurent Destailleur
3722274029 Merge pull request #5317 from atm-gauthier/develop_add_restrictions_on_exports 
Develop add restrictions on exports
 2016-07-14 20:08:59 +02:00
Laurent Destailleur
a5123c06db Save the virtualhost so we can test without entering it each time. 2016-07-14 19:42:04 +02:00
Laurent Destailleur
2793cee829 Merge remote-tracking branch 'origin/4.0' into develop 2016-07-14 15:58:06 +02:00
Laurent Destailleur
ec6640af63 Add field virtualhost for website module 2016-07-14 15:54:46 +02:00
Laurent Destailleur
ec03ea8f70 Dev branch is now 5.0 alpha 2016-07-14 15:33:17 +02:00
Laurent Destailleur
258662e616 Fix: missing month of update in leave "view log" page. 2016-07-14 15:31:56 +02:00
Laurent Destailleur
241fd8db98 Fix css 2016-07-14 15:22:04 +02:00
Laurent Destailleur
f256de323e Fix management of preview for website module 2016-07-14 13:03:37 +02:00
Laurent Destailleur
fabd74169f Fix: missing 'Maximize' button on full toolbar set of ckeditor. 2016-07-14 11:46:32 +02:00
Laurent Destailleur
9bd937a3bc Merge remote-tracking branch 'origin/3.9' into 4.0 2016-07-14 00:35:59 +02:00
Laurent Destailleur
10e7fa51fc Fix missing parameters to provide all information required for 
substitution hooks
 2016-07-13 23:06:41 +02:00
Laurent Destailleur
dc51eb0b75 Fix missing badge 2016-07-13 22:21:18 +02:00
Juanjo Menent
015b941966 Merge pull request #5478 from simnandez/4.0 
Merge #5464 Fix: Prevent SQLiFix into 4.0
 2016-07-13 12:45:17 +02:00
Laurent Destailleur
c787e7f2a1 FIX Clear of filter should also reset categories and extrafields filter 
FIX Filter on categories should depends on context
 2016-07-13 12:03:30 +02:00
Juanjo Menent
fc5b308605 Merge remote-tracking branch 'upstream/develop' into 4.0 2016-07-13 12:00:50 +02:00
Juanjo Menent
df74fa37de Merge pull request #5464 from AppChecker/develop 
Fix: Prevent SQLi
 2016-07-13 08:45:00 +02:00
Laurent Destailleur
490336b2e8 Fix bad dependency. 2016-07-12 20:07:53 +02:00
Laurent Destailleur
73f574b649 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/install/repair.php
 2016-07-12 19:30:01 +02:00
Laurent Destailleur
baeedd3690 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-07-12 19:26:55 +02:00
Laurent Destailleur
f972b15f5f FIX #5068 2016-07-12 19:22:14 +02:00
Alexis Algoud
572b2fdec7 FIX dasboard wrong for late invoice 2016-07-12 15:01:43 +02:00
Laurent Destailleur
9c06e07f07 Code comment 2016-07-12 13:03:56 +02:00
Laurent Destailleur
dc138e20e7 FIX: Can't edit label 2016-07-12 10:58:32 +02:00
Laurent Destailleur
1756fdbc9f Popup on links not visible. 2016-07-11 12:59:07 +02:00
appchecker
f618f330b3 replace intval with GETPOST 2016-07-11 13:01:16 +03:00
appchecker
7facaac973 replace intval with GETPOST 2016-07-11 12:58:59 +03:00
appchecker
4b1dfbc2fb replace intval with GETPOST 2016-07-11 12:56:05 +03:00
Laurent Destailleur
b72123e7ec Fix custom code must be visible only for products 2016-07-11 11:43:59 +02:00
Laurent Destailleur
329bdfc9fd FIX We must take last recent price when using several level of prices 2016-07-11 11:35:38 +02:00
Laurent Destailleur
d5f221452e Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-07-11 11:34:28 +02:00
Laurent Destailleur
0367cee671 FIX We must take the last recent defined price when using price level 2016-07-11 11:34:11 +02:00
Laurent Destailleur
7e000d4ce2 Fix missing css opacitymedium 2016-07-11 10:46:44 +02:00
Laurent Destailleur
1efedbdade Fix badge on project tab 2016-07-11 10:37:43 +02:00
Laurent Destailleur
2e372ced1e Fix missing fields 2016-07-11 10:28:57 +02:00