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

57073 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
d1ef145a6d Merge pull request #6185 from gnovaro/patch-4 
var to public
 2016-12-18 11:29:57 +01:00
Laurent Destailleur
eb71e987c8 Merge pull request #6177 from gnovaro/patch-3 
Replace var to public
 2016-12-18 11:28:37 +01:00
Laurent Destailleur
3d57a457eb Merge pull request #6176 from gnovaro/patch-2 
Replace attributes var for public
 2016-12-18 11:28:04 +01:00
Laurent Destailleur
f762c98a37 Fix html not balanced 2016-12-18 11:27:22 +01:00
Laurent Destailleur
2fd3aa54f5 Merge pull request #6173 from defrance/patch-62 
Cleaning code
 2016-12-18 11:17:22 +01:00
Laurent Destailleur
4ece746437 Merge pull request #6168 from defrance/patch-61 
FIX navigation field is always ref
 2016-12-18 11:02:14 +01:00
Laurent Destailleur
12e919b99d Merge pull request #6182 from atm-ph/fix_develop_user_right_write_margin 
Fix user right write margin
 2016-12-18 10:53:34 +01:00
Laurent Destailleur
8d9ec4f755 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-12-18 10:47:45 +01:00
Laurent Destailleur
58a0cb5838 Fix css style 2016-12-18 10:47:24 +01:00
Laurent Destailleur
60b8582aa9 Fix more then 30 security defects 2016-12-18 01:44:26 +01:00
Laurent Destailleur
9fd48df839 Fix minor bug on subscription pages 2016-12-17 19:21:48 +01:00
Gustavo Novaro
a321ab5f31 var to public 
Update deprecated code style
 2016-12-17 03:27:32 -03:00
Laurent Destailleur
c750ba8b99 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
	htdocs/install/mysql/data/llx_c_payment_term.sql
	htdocs/langs/en_US/bills.lang
	htdocs/langs/en_US/mails.lang
 2016-12-16 13:56:55 +01:00
Laurent Destailleur
929904041d Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 
Conflicts:
	htdocs/conf/conf.php.example
	htdocs/langs/en_US/mails.lang
 2016-12-16 13:53:34 +01:00
Laurent Destailleur
534e2b1282 FIX Security to restrict email sending was not efficient 2016-12-16 13:46:39 +01:00
Laurent Destailleur
c9ce955505 Finish work "Can filter on status on objects on the "statistics" pages" 2016-12-16 01:26:01 +01:00
Laurent Destailleur
5c6ecf9aeb Complete work on new list v5 2016-12-16 01:12:24 +01:00
Laurent Destailleur
209990fd15 Fix look and feel v5 2016-12-15 23:28:18 +01:00
Laurent Destailleur
7fdd6ccbd2 Prepare 4.0.3 2016-12-15 22:50:20 +01:00
phf
cca7967144 Merge branch 'fix_user_right_write_margin' into fix_develop_user_right_write_margin 2016-12-15 16:19:54 +01:00
BENKE Charlie
8b4aa701d7 Update note.php 2016-12-15 15:04:59 +01:00
BENKE Charlie
6766c33110 Update info.php 2016-12-15 15:02:45 +01:00
Gustavo Novaro
da7a4a9283 Replace var to public 
Improve code style
 2016-12-15 10:31:46 -03:00
Gustavo Novaro
54b433ff6b Replace attributes var for public 
Improve code style.
 2016-12-15 09:54:45 -03:00
Laurent Destailleur
8f3ce46c50 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 2016-12-15 12:12:36 +01:00
Laurent Destailleur
2c4c48ad6f Better fix to add server name into email id. 2016-12-15 12:11:39 +01:00
phf
21a648a052 Fix user right on margin module to write buyprice 2016-12-15 12:01:46 +01:00
Laurent Destailleur
d32fd7aa11 FIX javascript xss injection and a translation 2016-12-15 11:55:33 +01:00
BENKE Charlie
c2dc140024 Cleaning code 2016-12-15 11:09:03 +01:00
phf
7376170f01 Merge branch '3.9' of https://github.com/Dolibarr/dolibarr into 3.9 2016-12-15 09:42:11 +01:00
BENKE Charlie
2cebeb72aa FIX navigation field is always ref 2016-12-14 15:04:07 +01:00
Laurent Destailleur
ecab7cb70e Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/extrafields.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/product/class/product.class.php
 2016-12-14 12:29:41 +01:00
Laurent Destailleur
d2e4888bdd Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 2016-12-14 12:21:33 +01:00
Laurent Destailleur
e4dd020887 Fix bad concat 2016-12-14 11:23:55 +01:00
Laurent Destailleur
af407a094a FIX Introduce hidden option MAIL_PREFIX_FOR_EMAIL_ID to solve pb of 
tracking email.
 2016-12-14 11:20:44 +01:00
Laurent Destailleur
56b3f2c011 FIX Introduce hidden option MAIL_PREFIX_FOR_EMAIL_ID to solve pb of 
tracking email.
 2016-12-14 10:36:11 +01:00
Laurent Destailleur
530d3503f5 FIX Introduce hidden option MAIL_PREFIX_FOR_EMAIL_ID to solve pb of 
tracking email.
 2016-12-14 10:32:31 +01:00
Laurent Destailleur
9f0528f5f1 Complete work on dol_banner 2016-12-14 00:06:50 +01:00
Laurent Destailleur
43d18cd70c FIX if a supplier price reference is changed after creating an order, we 
can't clone order.
 2016-12-13 13:22:24 +01:00
Laurent Destailleur
c11888bcde Fix responsive 2016-12-13 02:18:14 +01:00
Laurent Destailleur
76195f9e45 Fix translation 2016-12-13 01:58:28 +01:00
Laurent Destailleur
d2d0e66c5c Fix style fo ECM module 2016-12-13 01:19:33 +01:00
Laurent Destailleur
71d2ee3aa9 Fix default of a column 2016-12-12 20:30:21 +01:00
Laurent Destailleur
4ac7460b26 Merge pull request #5826 from atm-maxime/new_modimport_update_option 
NEW modimport update option
 2016-12-12 16:30:51 +01:00
Laurent Destailleur
24914e8e4f Fix css and missing warning 2016-12-12 13:18:32 +01:00
Laurent Destailleur
5187ffcc9a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-12-12 13:03:37 +01:00
Laurent Destailleur
4e86e59fb3 Fix responsive 2016-12-12 13:02:54 +01:00
Laurent Destailleur
7600a10f2d FIX #6156 2016-12-12 12:33:43 +01:00
Laurent Destailleur
7077b4931c Add dump v5 2016-12-12 11:57:50 +01:00
Laurent Destailleur
5520864970 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-12-12 10:46:43 +01:00