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

49528 Commits

Author SHA1 Message Date
Laurent Destailleur
bf08407222 Merge pull request #6204 from gnovaro/patch-1 
var to public
 2016-12-23 00:45:58 +01:00
Laurent Destailleur
6d14710e18 Merge pull request #6199 from aspangaro/5.0-p14 
Loan | Donation | Social contribution : Complete work on dol_banner
 2016-12-23 00:45:08 +01:00
Laurent Destailleur
0aaedcc68c Merge pull request #6197 from aspangaro/5.0-b13 
Fix: Accountancy Expense report index
 2016-12-23 00:44:43 +01:00
Laurent Destailleur
594ecf400b Merge pull request #6196 from aspangaro/5.0-b12 
Fix: Travis
 2016-12-23 00:44:16 +01:00
Laurent Destailleur
4843e3f254 Merge pull request #6193 from bafbes/abb-22 
new: Professional identifiers for Algeria
 2016-12-23 00:42:42 +01:00
Laurent Destailleur
07e81830d1 Merge pull request #6195 from aspangaro/5.0-b11 
Fix: Traduction on index accountancy page & improvements
 2016-12-23 00:42:11 +01:00
Laurent Destailleur
2bfbf0f6a7 Fix css 2016-12-23 00:37:32 +01:00
Laurent Destailleur
1e1028605d FIX If mysql server is distant, the creation of user must use % as host 
with mysql.
 2016-12-23 00:23:57 +01:00
Laurent Destailleur
293560f9c1 Fix missing ref is object is supplier object 2016-12-22 17:41:58 +01:00
Laurent Destailleur
22b4a150a4 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 2016-12-22 17:31:22 +01:00
Laurent Destailleur
b4ed0a1e12 Fix nb of lat approvals wrong 2016-12-22 17:30:39 +01:00
Laurent Destailleur
bdead24e2e Fix bad var get 2016-12-22 17:27:58 +01:00
Laurent Destailleur
081d3f0814 Quick hack by adding hidden constant to solve a locking feature (how to 
add project if likned to another third on project view)
 2016-12-22 16:52:03 +01:00
Laurent Destailleur
b2776a62d8 Fix bad link 2016-12-22 16:23:38 +01:00
Laurent Destailleur
1307b93d55 Normalize code 2016-12-22 16:09:12 +01:00
Laurent Destailleur
4875509b56 Fix sort criterias 2016-12-22 15:57:19 +01:00
Laurent Destailleur
d66bc10d05 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/expensereport/list.php
 2016-12-22 15:54:01 +01:00
Laurent Destailleur
574f84bb84 Fix warning for approval delay. 2016-12-22 15:49:06 +01:00
Laurent Destailleur
77c320a092 Fix warning for expense report late 2016-12-22 15:33:43 +01:00
aspangaro
6caa3408ed Remove field Skype. Already present in dol_banner_tab. 2016-12-22 06:23:43 +01:00
aspangaro
d53a238b49 Fix: Accountancy - Problem on quadratus export 2016-12-22 06:12:42 +01:00
Ferran Marcet
ae7f49b5d8 FIX: Deposits and credit notes weren't added in the received and pending columns 2016-12-21 18:40:05 +01:00
aspangaro
c187f95269 Social contribution : Complete work on dol_banner 2016-12-20 21:59:05 +01:00
aspangaro
eb2d85ab78 Donation : Complete work on dol_banner & Fix project selector 2016-12-20 21:39:42 +01:00
Gustavo Novaro
3542364da8 var to public 
Improve code style to current php practices
 2016-12-20 17:11:50 -03:00
Laurent Destailleur
d08857d2c6 Fix photo resize 2016-12-20 19:35:47 +01:00
Raphaël Doursenaud
590fcf8399
NEW: Export max payment date with supplier invoices 2016-12-20 18:32:57 +01:00
BENKE Charlie
499eedffa1 $soc not needed (thirpartie 2016-12-20 15:17:17 +01:00
Laurent Destailleur
0ef963604f Fix option moreinheader not correctly supported with smtps 2016-12-20 12:38:24 +01:00
Laurent Destailleur
3c79f3acb5 Minor fixes or code comment 2016-12-20 12:06:26 +01:00
Laurent Destailleur
4d624fd875 Debug feature to choose email "from" 2016-12-20 11:23:44 +01:00
aspangaro
e9765c5190 Remove colspan 2016-12-20 07:33:03 +01:00
aspangaro
098dc08169 Loan : Complete work on dol_banner 2016-12-20 07:29:49 +01:00
Laurent Destailleur
be19a999f5 Fix regression losing warning on not defined emails 2016-12-19 18:11:53 +01:00
Laurent Destailleur
8fb9a55d8a Complete work on dol_banner 2016-12-19 16:35:40 +01:00
Laurent Destailleur
1fdbcf4c0f Fix missing page to match new reorg of agenda events (done for 
thirdparty but not complete for contact)
 2016-12-19 16:22:41 +01:00
aspangaro
0fae7ecd5a Fix: Accountancy Expense report index 2016-12-19 07:43:33 +01:00
aspangaro
9901aaa9fe Try to correct travis public underscore problem 2016-12-19 06:34:17 +01:00
aspangaro
23aea440d6 Fix: Travis 2016-12-19 06:04:54 +01:00
aspangaro
e1773249c3 Fix: Traduction on index accountancy page & improvements 2016-12-19 05:56:47 +01:00
Laurent Destailleur
0eded9a8b7 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 2016-12-19 02:36:10 +01:00
Laurent Destailleur
3f5d67d4d6 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 2016-12-19 02:35:16 +01:00
Laurent Destailleur
0d1d68d5d9 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 
Conflicts:
	htdocs/admin/dict.php
	htdocs/product/price.php
 2016-12-19 02:34:29 +01:00
Laurent Destailleur
876722733a Better fix to get localtax 2016-12-19 02:33:54 +01:00
Laurent Destailleur
74e00c4d80 More comment and hidden option to solve problems when sending emails. 2016-12-19 01:04:17 +01:00
Laurent Destailleur
dbf96b8f59 Log at wrong place 2016-12-18 23:32:31 +01:00
abb
08846da2d3 new: Professional identifiers for Algeria 2016-12-18 20:05:56 +01:00
abb
10b231bd9d new:identificateurs mprofessionnels pour l'algérie 2016-12-18 19:26:30 +01:00
Laurent Destailleur
fc401a9c68 Fix more security fixes 2016-12-18 17:27:06 +01:00
Laurent Destailleur
ac44aa6d81 FIX security bugs 2016-12-18 13:24:06 +01:00
Laurent Destailleur
e50bbb05fa Fix security bugs 2016-12-18 13:04:24 +01:00
Laurent Destailleur
54aa8696ad Fix regression 2016-12-18 13:01:26 +01:00
Laurent Destailleur
2644eb064e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-12-18 11:57:50 +01:00
Laurent Destailleur
9d3bd9d36f Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/errors.lang
 2016-12-18 11:57:04 +01:00
Laurent Destailleur
0e7da2cd22 FIX Label of project is in field title not label. 2016-12-18 11:55:30 +01:00
Laurent Destailleur
06ee3b0d1c Merge pull request #6192 from hregis/patch-1 
Fix: wrong name
 2016-12-18 11:39:21 +01:00
Laurent Destailleur
be3a6afb2a Better change for #6190 2016-12-18 11:38:31 +01:00
Laurent Destailleur
c4b96ee232 Merge pull request #6189 from gnovaro/patch-6 
HTML 5 doctype
 2016-12-18 11:32:03 +01:00
Laurent Destailleur
0988a2f173 Merge pull request #6187 from gnovaro/patch-5 
var to public
 2016-12-18 11:30:24 +01:00
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
a37b1fb6c1 Merge pull request #6171 from fmarcet/4.0 
FIX: Setting supplier as client when accept a supplier proposal
 2016-12-18 11:09:33 +01:00
Laurent Destailleur
e0db9a8ca7 Merge pull request #6169 from atm-gauthier/FIX_ttc_and_ht_must_always_be_available 
FIX : HT and TTC price should always be displayed together
 2016-12-18 11:08:33 +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
47bf442c84 Merge pull request #6167 from atm-florian/4.0 
GETPOST instead of $_GET
 2016-12-18 10:59:27 +01:00
Laurent Destailleur
b3d5f40f37 Merge pull request #6166 from atm-gauthier/3.9_fix_wrong_test 
FIX : wrong test on dict.php
 2016-12-18 10:58:32 +01:00
Laurent Destailleur
27785323ae Merge pull request #6164 from hregis/4.0_bug 
Fix: missing date locale and date rfc
 2016-12-18 10:57:29 +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
Regis Houssin
3e15ae3da7 Fix: wrong name 2016-12-18 10:33:20 +01:00
Laurent Destailleur
394e284a4a Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 
Conflicts:
	htdocs/core/class/CMailFile.class.php
	htdocs/langs/en_US/errors.lang
 2016-12-18 02:16:40 +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
Laurent Destailleur
73e6663230 Fix help/messages for emailing to warn users. 2016-12-17 14:47:06 +01:00
Laurent Destailleur
c5db333af8 Fix translation of error message when sending email 2016-12-17 14:00:39 +01:00
Gustavo Novaro
99c73cf11a HTML 5 doctype 
Improve install header to use html 5 doctype
 2016-12-17 04:48:41 -03:00
Gustavo Novaro
7728576f19 var to public 
Improve code style
 2016-12-17 03:49:28 -03:00
Gustavo Novaro
a321ab5f31 var to public 
Update deprecated code style
 2016-12-17 03:27:32 -03:00
Laurent Destailleur
d8e394d3aa FIX Missing field 2016-12-16 17:09:15 +01: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