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

49907 Commits

Author SHA1 Message Date
Laurent Destailleur
31818e8816 Fix missing translation 2017-01-13 15:32:20 +01:00
gauthier
a90ec7a8c7 FIX : hidetop progression 2017-01-13 14:59:29 +01:00
Laurent Destailleur
3a2f44adac Fix security permissions to edit/delete time spent 2017-01-13 14:24:39 +01:00
Laurent Destailleur
380b61a0e9 FIX Can make a stock transfert on product not on sale/purchase. 2017-01-12 21:56:50 +01:00
Laurent Destailleur
edb79de54e FIX javascript error 2017-01-12 18:07:19 +01:00
gauthier
1886e68731 FIX : progress size 2017-01-12 17:07:22 +01:00
gauthier
307c06dfc3 FIX : pdf invoice when we use situation 2017-01-12 16:26:09 +01:00
Laurent Destailleur
32a453e8e6 Fix label combo 2017-01-12 15:44:20 +01:00
Laurent Destailleur
f185a09693 FIX Security access problem with external users on projects/tasks 2017-01-12 15:26:00 +01:00
Laurent Destailleur
8d5c853267 FIX Protection so even if link is output for external user, links is 
disabled.
 2017-01-12 15:12:53 +01:00
Laurent Destailleur
13787881d4 Fix css 2017-01-12 11:46:13 +01:00
Laurent Destailleur
e82aa97d0e Merge pull request #6266 from simnandez/4.0 
FIX #6245 Thirdparty link in supplier invoices list, links to "comm/card" instead of "fourn/card" page
 2017-01-12 11:13:14 +01:00
Laurent Destailleur
c42b48636a Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 
Conflicts:
	htdocs/commande/class/api_commande.class.php
	htdocs/core/class/CMailFile.class.php
	htdocs/societe/class/api_contact.class.php
 2017-01-12 11:06:24 +01:00
Laurent Destailleur
762dd8030e Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-01-12 10:59:41 +01:00
Laurent Destailleur
7476a3c8ae Fix error during migration 2017-01-12 10:59:27 +01:00
Laurent Destailleur
e802ff3385 Fix POO declaration 2017-01-12 10:57:15 +01:00
Laurent Destailleur
5e71ff816f Increase limit for better backward compatibility without loosing minimum 
security.
 2017-01-12 10:51:31 +01:00
Laurent Destailleur
351c416ed8 Merge pull request #6265 from hregis/4.0_bug 
Fix: avoid errors if constants values not exists
 2017-01-12 10:49:23 +01:00
Laurent Destailleur
721534d676 Merge pull request #6264 from atm-florian/5.0 
fix : warehouse creation failed with mysql 5.7 (string 'NULL' instead of "NULL")
 2017-01-12 10:39:13 +01:00
Laurent Destailleur
f408c886b6 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0 2017-01-12 10:16:32 +01:00
Laurent Destailleur
3d8c5b377b Fix string not translated 2017-01-12 10:16:19 +01:00
Laurent Destailleur
46e330f749 Merge pull request #6256 from aspangaro/5.0-23 
Fix : Bank - Presentation, no titlefield in a list
 2017-01-12 10:09:38 +01:00
Laurent Destailleur
7a8a95c815 Merge pull request #6249 from KiteAtao/4.0 
Fix #6247 #6248 Contact and Commands REST WebServices failed
 2017-01-12 10:08:32 +01:00
Laurent Destailleur
4ea78d20f0 Merge pull request #6251 from aspangaro/5.0-22 
Fix : Bank - Missing language file
 2017-01-12 10:06:42 +01:00
Laurent Destailleur
749f8cf252 Fix translation 2017-01-12 00:15:00 +01:00
Juanjo Menent
bcba4a1a38 FIX #6253 Supplier invoice list filter does not respect "thirdparty" filter 2017-01-11 20:48:32 +01:00
Juanjo Menent
ac58fd91af FIX #6253 Supplier invoice list filter does not respect "thirdparty" filter 2017-01-11 20:46:50 +01:00
Juanjo Menent
eb2ea07c76 FIX #6245 Thirdparty link in supplier invoices list, links to "comm/card" instead of "fourn/card" page 2017-01-11 20:32:39 +01:00
Regis Houssin
5898d27609 Fix: avoid errors if constants values not exists 2017-01-11 16:47:17 +01:00
Laurent Destailleur
5553be4aa9 Fix code comment 2017-01-11 16:08:04 +01:00
florian HENRY
2c2bb366bd fix : warehouse creation failed with mysql 5.7 (string 'NULL' instead of 
"NULL")
 2017-01-11 09:19:07 +01:00
Laurent Destailleur
1559c45a61 FIX link for not found photo when using gravatar. Must use external url 2017-01-10 09:24:55 +01:00
Laurent Destailleur
70e6c2d41f Fix bad count of nb of contacts in statistics 2017-01-10 00:42:28 +01:00
Laurent Destailleur
decbda3e23 Fix inversion application name - company name 2017-01-09 23:26:31 +01:00
Laurent Destailleur
a9354e5f27 Fix generic text must be set before specific for notification 2017-01-09 21:07:54 +01:00
Laurent Destailleur
8ab0ad3b72 Fix css 2017-01-09 10:36:24 +01:00
Laurent Destailleur
03aa8343fd Fix css 2017-01-09 10:21:35 +01:00
Laurent Destailleur
62a668d899 Fix https link 2017-01-09 10:02:17 +01:00
aspangaro
a583fd7a3b Fix : Bank - Presentation, no titlefield in a list 2017-01-08 20:52:42 +01:00
Laurent Destailleur
dba777c57b Fix missing field alias 2017-01-08 12:10:07 +01:00
Laurent Destailleur
1856b5cfb8 Fix filter on status for third parties 2017-01-08 11:50:43 +01:00
Laurent Destailleur
913df73ed9 Fix css 2017-01-08 11:31:39 +01:00
Laurent Destailleur
41832a0c26 Fix neutral color on login (no theme yet selected) 2017-01-08 11:20:29 +01:00
aspangaro
dc605c915a Fix : Bank - Missing language file 2017-01-08 07:46:30 +01:00
Laurent Destailleur
76a53dfb7d FIX Accept spaces around the | criteria 2017-01-08 01:01:34 +01:00
Laurent Destailleur
2c1477ecea Revert "FIX Accept spaces around the | criteria" 
This reverts commit 37d158f159.
 2017-01-07 21:50:14 +01:00
KiteAtao
5c76229cdf Fix Commands Api for REST WebServices 2017-01-07 21:46:49 +01:00
KiteAtao
3bb1756a13 Fix Contact Api for REST WebServices 2017-01-07 21:37:45 +01:00
Laurent Destailleur
37d158f159 FIX Accept spaces around the | criteria 2017-01-07 21:34:12 +01:00
Laurent Destailleur
6585431849 Fix css 2017-01-07 17:32:45 +01:00
Laurent Destailleur
fba7d73052 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-01-07 17:06:16 +01:00
Laurent Destailleur
71d8a81751 Fix color green is reserved to say ok not for neutral messages. 2017-01-07 17:05:55 +01:00
Laurent Destailleur
7f8d4deb59 Merge pull request #6239 from tarrsalah/5.0 
Fix undefined method getProjectsAuthorizedForUser.
 2017-01-07 16:48:48 +01:00
Laurent Destailleur
e6cdcfca00 Close #6240 2017-01-07 16:47:11 +01:00
Laurent Destailleur
8ee838c9c4 Minor fixes in accounting module. 2017-01-07 16:17:15 +01:00
Laurent Destailleur
b21998d506 Fix global checksum not visible on old versions. Link with checksum file 
to check was hardcoded.
 2017-01-07 15:56:04 +01:00
Laurent Destailleur
358616cda2 Fix link should be https 2017-01-07 15:18:57 +01:00
Laurent Destailleur
680c48d90a Fix error on expired tokens 2017-01-07 14:48:05 +01:00
Laurent Destailleur
005a40c105 Fix css on login page. Pb with autocomplete-autofill. 2017-01-07 14:17:35 +01:00
Laurent Destailleur
9cfc8d4095 Fix several problems into OAuth2 module. 2017-01-06 19:58:46 +01:00
Laurent Destailleur
4002ec9fd5 Fix css install and login 2017-01-06 15:51:08 +01:00
Laurent Destailleur
206335bc56 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-01-04 18:14:19 +01:00
Laurent Destailleur
983efdd6ee FIX repair tool was ko to restore extrafields with type select. 2017-01-04 18:13:36 +01:00
Laurent Destailleur
71e368aa83 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-01-04 17:04:25 +01:00
tarrsalah
eb62c1eb0d fix undefined method getProjectsAuthorizedForUser. 
When a user don't have the permission
`$user->rights->projet->all->lire`, viewing some tasks related entities
(like `tasks/contact.php?id=1&withproject=1`) cause `Call to undefined
method Task::getProjectsAuthorizedForUser()` fatal error.

The problem is caused by calling getProjectsAuthorizedForUser on $object
insted of $projectstatic.
 2017-01-04 16:35:04 +01:00
Laurent Destailleur
2aae4ea6ea FIX We must not drop column if there is still record on other entities. 2017-01-04 15:05:13 +01:00
Laurent Destailleur
212f200454 Fix phpcs 2017-01-03 11:38:31 +01:00
Laurent Destailleur
466dfc85a3 Prepare RC1 2017-01-03 10:36:27 +01:00
Laurent Destailleur
53137e53fe Fix prepare RC 2017-01-03 10:33:56 +01:00
Laurent Destailleur
a4edaf4f43 Fix sql to get next ref on expense report 2017-01-03 10:18:47 +01:00
Laurent Destailleur
c635baa848 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 
Conflicts:
	htdocs/langs/en_US/errors.lang
 2017-01-03 01:34:15 +01:00
Laurent Destailleur
157b17b6d5 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 
Conflicts:
	htdocs/filefunc.inc.php
	htdocs/langs/en_US/errors.lang
 2017-01-03 01:31:58 +01:00
Laurent Destailleur
7dc55daf38 FIX #6229 2017-01-02 14:37:07 +01:00
Laurent Destailleur
85f9da7718 Fix link 2017-01-02 13:52:32 +01:00
Laurent Destailleur
fd09a3d35e Fix link to notes and download pdf not visible on list of expense report 2017-01-02 13:51:05 +01:00
Laurent Destailleur
e4a5302f51 Fix bad sort order 2017-01-02 12:41:33 +01:00
Laurent Destailleur
9694a00179 Fix sort is lost on agenda/event of projects 2017-01-02 12:39:12 +01:00
Laurent Destailleur
477b9c8338 Fix duplicate view of agenda/events for projects 2017-01-02 12:34:23 +01:00
Laurent Destailleur
40fa816b99 Fix missing total of timespent 2017-01-02 12:27:34 +01:00
Laurent Destailleur
1b352768c2 Fix remove debug info 2017-01-02 12:18:17 +01:00
Laurent Destailleur
064f38b89e Fix condition to show time spent on project overview 2017-01-02 12:17:27 +01:00
Laurent Destailleur
f07c741176 Fix missing error message on invoice creation 2017-01-02 11:31:21 +01:00
Laurent Destailleur
d986247e0f Fix dol_banner 2017-01-01 19:53:05 +01:00
Laurent Destailleur
ec503d08f6 Fix dol_banner usage 2016-12-31 17:01:31 +01:00
Laurent Destailleur
97679a7309 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-12-31 16:36:10 +01:00
Laurent Destailleur
b642a3a602 Prepare release 5.0 2016-12-31 16:35:56 +01:00
Laurent Destailleur
98f376faa2 Merge pull request #6232 from TiJof/patch-1 
Typo in SQL request
 2016-12-31 16:32:49 +01:00
Laurent Destailleur
3c81346756 Merge pull request #6218 from atm-florian/develop 
fix : avoid bug when batch number is not trimmed
 2016-12-31 16:32:20 +01:00
Laurent Destailleur
31888b0b1d Merge pull request #6215 from aspangaro/5.0-17 
Supplier invoice - Complete dol_banner_tab & presentation
 2016-12-31 16:19:12 +01:00
Rabouin Geoffroy
a277a6f190 Typo in SQL request 2016-12-28 10:26:31 +01:00
aspangaro
5f861c1067 Merge remote-tracking branch 'Upstream/develop' into 5.0-17 2016-12-27 15:07:29 +01:00
Marcos García de La Fuente
98599b0bbf FIX #6227 Document models table header "Unit" is shown in 2 lines in Spanish 2016-12-27 12:56:49 +01:00
Laurent Destailleur
7dd06a1ae6 Fix margin pagination 2016-12-27 02:01:27 +01:00
Laurent Destailleur
6e00d7fee3 Fix date modification not visible 2016-12-27 01:41:04 +01:00
Laurent Destailleur
003045525f Fix css 2016-12-27 01:32:29 +01:00
Laurent Destailleur
3e28f22bad Fix style 2016-12-27 00:08:43 +01:00
Laurent Destailleur
c5850d29e7 Fix checksum integrity. Also add a global checksum. 2016-12-26 19:51:24 +01:00
Laurent Destailleur
83a8fcb7f9 Fix filecheck tool. 2016-12-26 19:01:24 +01:00
Laurent Destailleur
374a6d7783 Fix filecheck tool. 2016-12-26 18:50:20 +01:00
Laurent Destailleur
82052450a6 Complete work on dol_banner 2016-12-26 18:21:18 +01:00
Laurent Destailleur
b9e362833f More complete label 2016-12-26 13:15:14 +01:00
Laurent Destailleur
bbd3734a21 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/list.php
	htdocs/filefunc.inc.php
 2016-12-26 12:42:23 +01:00
Laurent Destailleur
635157be4c Fix bad translation 2016-12-26 12:36:30 +01:00
Laurent Destailleur
e297b64722 Several security fix in using mailings. 2016-12-26 12:35:10 +01:00
Laurent Destailleur
c9c8079c3d Can add additionnal paramon mail to solve rare sendmail problems 2016-12-26 00:00:28 +01:00
Laurent Destailleur
45028de51f Better fix for install on distant server 2016-12-25 23:47:25 +01:00
Laurent Destailleur
c16489a3c0 Fix add message to explain why some emails fails 2016-12-25 23:14:51 +01:00
Laurent Destailleur
cdcbf58ca8 Prepare 3.9.5 2016-12-23 17:33:54 +01:00
Laurent Destailleur
7e2b41402e Fix bad balance of form 2016-12-23 16:24:07 +01:00
Laurent Destailleur
a9beeec0b3 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0 2016-12-23 16:03:09 +01:00
Laurent Destailleur
8ce5ed0192 Fix position of discount on PDF with US letter format 2016-12-23 15:57:31 +01:00
Laurent Destailleur
46a8041143 Clean orphelins 2016-12-23 15:22:25 +01:00
Laurent Destailleur
cb4e0233b9 Fix orphelins 2016-12-23 15:21:38 +01:00
Laurent Destailleur
a2133f391f Complete work on dol_banner 2016-12-23 14:52:25 +01:00
Laurent Destailleur
43942e6ea2 Fix css and fix navigation on resource tab. 2016-12-23 13:04:46 +01:00
florian HENRY
30b4d9e2e5 fix : avoid bug when batch number is not trimmed 2016-12-23 12:10:55 +01:00
Laurent Destailleur
b777ec79f2 Fix contextpage implementation into skeleton 2016-12-23 10:38:27 +01:00
aspangaro
b97135240c Complete dol_banner_tab 2016-12-23 07:37:34 +01:00
aspangaro
ab8341cc8b Presentation 2016-12-23 06:33:58 +01:00
Laurent Destailleur
da1d4d80f2 Fix return code REST similar for all api with POST 2016-12-23 02:09:26 +01:00
Laurent Destailleur
9e44eb0d15 Fix return code REST similar for all api with POST 2016-12-23 02:08:22 +01:00
Laurent Destailleur
84fa65ac19 Merge pull request #6208 from aspangaro/5.0-15 
Remove field Skype. Already present in dol_banner_tab.
 2016-12-23 00:53:05 +01:00
Laurent Destailleur
99a501fcfb Merge pull request #6207 from aspangaro/4.0-p1 
Fix: Accountancy - Problem on quadratus export
 2016-12-23 00:52:47 +01:00
Laurent Destailleur
792da7f56d Merge pull request #6205 from fmarcet/4.0 
FIX: Deposits and credit notes weren't added in column invoices list
 2016-12-23 00:51:59 +01:00
Laurent Destailleur
9948b6d4d9 Merge pull request #6202 from GPCsolutions/supplierpaymentdateexport 
NEW: Export max payment date with supplier invoices
 2016-12-23 00:50:30 +01:00
Laurent Destailleur
66b8cfe9fd Merge pull request #6200 from defrance/patch-63 
$soc not needed (thirpartie used instead)
 2016-12-23 00:46:22 +01:00
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
Laurent Destailleur
f7e5898b4a Fix show a more accurate translation 2016-12-20 10:58:31 +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
94eeaf9ed0 Fix typo error 2016-12-19 18:47:21 +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
321933f267 Fix deletion of product 2016-12-18 02:10:26 +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
Ferran Marcet
2777c4d4a5 FIX: Setting supplier as client when accept a supplier proposal 2016-12-14 18:35:59 +01:00
gauthier
1f1c75adfb FIX : HT and TTC price should always be displayed together 2016-12-14 15:50:50 +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
Regis Houssin
cb21ad2cc5 Merge remote-tracking branch 'origin/4.0' into 4.0_bug 2016-12-13 16:52:36 +01:00
florian HENRY
3992a92dd4 Merge branch '4.0' of https://github.com/Dolibarr/dolibarr.git into 4.0 2016-12-13 13:34:05 +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
gauthier
4dd740fe2f FIX : wrong test on dict.php 2016-12-13 11:41:26 +01:00
Regis Houssin
337509d40f Fix: missing date locale and date rfc 2016-12-13 09:40:08 +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
568277433f Merge pull request #6159 from tarrsalah/fix_vat_defaul_localtax 
fix (#6158)default localtax1 and localtax2 values.
 2016-12-12 01:03:31 +01:00
Laurent Destailleur
0c84a0f9af Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-12-11 22:10:34 +01:00
tarrsalah
eb6620f6f6 fix (#6158)default localtax1 and localtax2 values. 2016-12-11 17:56:49 +01:00
Maxime Kohlhaas
04ed2df827 Merge branch 'develop' of github.com:Dolibarr/dolibarr into new_modimport_update_option 
# Conflicts:
#	htdocs/imports/import.php
 2016-12-11 16:20:46 +01:00
Laurent Destailleur
6c4f15df63 Fix lot of fix in css look to match v5 rules. 2016-12-11 16:11:42 +01:00
Juanjo Menent
1c71eed703 Very best fix of cancel edit line 2016-12-11 15:37:29 +01:00
Juanjo Menent
7915021495 Best fix of cancel edit line 2016-12-11 15:23:07 +01:00
Juanjo Menent
c62a2fb97e Best fix of cancel edit line 2016-12-11 15:21:06 +01:00
Juanjo Menent
5233c65aba Merge pull request #6152 from jpfox/develop 
FIX cancelling order line modification returned to list instead of card
 2016-12-11 15:00:37 +01:00
Jean-Pierre Morfin
4a39c79d56 FIX cancelling order line modification returned to list instead of card 2016-12-11 14:32:27 +01:00
Juanjo Menent
5c4ab99a9a Merge pull request #6132 from simnandez/3.9 
Fix #5646 Error editing Sell Price on products/services
 2016-12-11 14:32:00 +01:00
Juanjo Menent
6e30831611 Merge pull request #6149 from simnandez/develop 
Fix Uniformize status alignment
 2016-12-11 14:31:33 +01:00
Juanjo Menent
34cc4b3db5 Merge pull request #6151 from atm-maxime/mko_minor_fix 
Minor fixes
 2016-12-11 14:30:58 +01:00
Juanjo Menent
c74cdaf890 Merge pull request #6150 from aspangaro/5.0-b8 
Problem of traduction
 2016-12-11 14:29:59 +01:00
Maxime Kohlhaas
4296a2802c Wrong menu in tab link on user card 2016-12-11 14:27:10 +01:00
Juanjo Menent
3abbb2a3e5 Fix Uniformize status alignment 2016-12-11 14:19:23 +01:00
aspangaro
b7babb8a48 Problem of traduction 2016-12-11 14:13:48 +01:00
Maxime Kohlhaas
5c6a1bece0 Merge branch 'develop' of github.com:Dolibarr/dolibarr into mko_minor_fix 2016-12-11 14:12:21 +01:00
Maxime Kohlhaas
5ed041c0cd Rights should not be given by default 2016-12-11 14:11:28 +01:00
Juanjo Menent
6503d4db21 Merge pull request #6148 from defrance/patch-60 
print_barre_liste only on top of list
 2016-12-11 14:06:32 +01:00
BENKE Charlie
37d734387b print_barre_liste only on top of list 2016-12-11 14:03:48 +01:00
Maxime Kohlhaas
6964f196c8 Fix bank account box 2016-12-11 14:01:04 +01:00
Maxime Kohlhaas
083aa63fb4 Merge branch 'develop' of github.com:Dolibarr/dolibarr into mko_multicurrency_debug 2016-12-11 13:55:07 +01:00
Maxime Kohlhaas
df019b255f Merge branch 'develop' of github.com:Dolibarr/dolibarr into mko_multicurrency_debug 
# Conflicts:
#	htdocs/commande/class/commande.class.php
 2016-12-11 13:48:24 +01:00
Maxime Kohlhaas
11d9d5096e Merge branch 'develop' of github.com:Dolibarr/dolibarr into mko_minor_fix 2016-12-11 13:46:24 +01:00
Maxime Kohlhaas
b5712d1f1c Missing lang load 2016-12-11 13:44:47 +01:00
Maxime Kohlhaas
f800e38099 Wrong fields in soc list 2016-12-11 13:39:44 +01:00
Laurent Destailleur
2a61b360e9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-12-11 13:32:05 +01:00
Laurent Destailleur
74c463fd21 Fix phpcs 2016-12-11 13:31:15 +01:00
Laurent Destailleur
caa71b4463 Merge pull request #6140 from jpfox/develop 
FIX updating supplier order line
 2016-12-11 13:27:47 +01:00
Laurent Destailleur
0c5f66f10d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-12-11 13:24:55 +01:00
Laurent Destailleur
871c69ad08 Merge branch 'fix_banks_trans_missing' of 
https://github.com/tarrsalah/dolibarr into
tarrsalah-fix_banks_trans_missing

Conflicts:
	htdocs/core/lib/company.lib.php
 2016-12-11 13:21:21 +01:00
Laurent Destailleur
6fa84206aa Merge pull request #6141 from atm-ph/fix_develop_multicurrency_historisation_rate 
Fix no historisation of rate
 2016-12-11 13:18:35 +01:00
Laurent Destailleur
2dcb97e61d Continue work on dol_banner 2016-12-11 13:16:21 +01:00
tarrsalah
0547c91d75 Fix #6142 
load "banks" translation when constructing societe tab head in
`societe_prepare_head`.
 2016-12-11 13:10:05 +01:00
phf
9adc994e21 Fix no historisation of rate 2016-12-11 12:01:38 +01:00
Jean-Pierre Morfin
a4e424ee0e FIX updating supplier order line 2016-12-11 11:59:49 +01:00
Maxime Kohlhaas
1e6196dc4a Merge branch 'develop' of github.com:Dolibarr/dolibarr into mko_multicurrency_debug 2016-12-11 11:59:42 +01:00
Laurent Destailleur
224bd12065 Fix css for limit after a link to intervention 2016-12-11 11:51:50 +01:00
Laurent Destailleur
372f50bbde FIX Do not show total of balance if currencies differs 2016-12-11 11:51:21 +01:00
Laurent Destailleur
c6293db23c Try a better fix for responsive and avoid scrolling on field selectors 2016-12-11 11:28:30 +01:00
Laurent Destailleur
190f432c23 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-12-11 11:07:22 +01:00
Laurent Destailleur
4969af8c74 Merge remote-tracking branch 'origin/4.0' into develop 
Conflicts:
	ChangeLog
	htdocs/product/card.php
 2016-12-11 11:04:15 +01:00
Laurent Destailleur
95d8faef04 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 
Conflicts:
	htdocs/product/class/product.class.php
 2016-12-11 10:51:15 +01:00
Maxime Kohlhaas
ac41b61ad8 Empty inputs when editing line 2016-12-11 10:48:49 +01:00
Laurent Destailleur
7fd75c793a FIX Regression when deleting product 2016-12-11 10:39:48 +01:00
Juanjo Menent
aa2d783aaa Merge pull request #6134 from atm-maxime/fix_photo_product 
Fix product photo in tooltip
 2016-12-11 10:21:31 +01:00
Maxime Kohlhaas
0302e8c1f8 Missing comment 2016-12-11 09:29:20 +01:00
Laurent Destailleur
c1ec3d9b73 Merge pull request #6135 from defrance/patch-59 
Add translation tabs
 2016-12-11 02:59:09 +01:00
Laurent Destailleur
144743df6d Merge pull request #6131 from defrance/patch-57 
Bad return on linkback
 2016-12-11 02:57:23 +01:00
Laurent Destailleur
aa3bfb06cd Merge pull request #6133 from defrance/patch-58 
Bad number rights on User badge tabs
 2016-12-11 02:54:46 +01:00
Laurent Destailleur
9b436ce871 Merge remote-tracking branch 'origin/3.9' into 4.0 
Conflicts:
	htdocs/product/class/product.class.php
 2016-12-11 02:51:32 +01:00
Maxime Kohlhaas
d6083cccb8 Merge branch 'develop' of github.com:Dolibarr/dolibarr into mko_multicurrency_debug 2016-12-11 02:50:42 +01:00
Maxime Kohlhaas
a4a47a064c fix missing commit and return 2016-12-11 02:50:31 +01:00
Maxime Kohlhaas
f7524b93ad Actualize currency on supplier order and invoice 2016-12-11 02:50:21 +01:00
Laurent Destailleur
b42a2616bc Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/install/mysql/migration/3.8.0-3.9.0.sql
 2016-12-11 02:34:59 +01:00
Laurent Destailleur
859a9cadcb Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-12-11 02:32:13 +01:00
Laurent Destailleur
7d5c708043 Fix size of field for member list 2016-12-11 02:31:59 +01:00
Laurent Destailleur
4e75f064fe Fix popup of selection of fields 2016-12-11 02:22:54 +01:00
Laurent Destailleur
2802be2ed5 Fix bad limit 2016-12-11 02:20:13 +01:00
Maxime Kohlhaas
3d2143809b Multicurrency on supplier order and invoice 2016-12-11 02:09:57 +01:00
Maxime Kohlhaas
177ec97689 Actualize currency on propal, order and invoice 2016-12-11 01:04:58 +01:00
Maxime Kohlhaas
d426ab04f0 Multicurrency on proposal and order 2016-12-11 00:42:52 +01:00
Maxime Kohlhaas
707ca379c9 Fix currency on supplier order creation 2016-12-10 23:57:26 +01:00
BENKE Charlie
b645a50742 Add translation tabs 2016-12-10 23:49:09 +01:00
Maxime Kohlhaas
3befe1b83f Fix product photo in tooltip 2016-12-10 23:34:32 +01:00
BENKE Charlie
f2eb73a101 Update info.php 2016-12-10 23:32:01 +01:00
BENKE Charlie
5bc3107c5d Update note.php 2016-12-10 23:30:31 +01:00
BENKE Charlie
35107f1dbf bad number rights on badge tabs 2016-12-10 23:29:43 +01:00
Juanjo Menent
56aafa4660 Fix #5646 Error editing Sell Price on products/services 2016-12-10 23:25:13 +01:00
Laurent Destailleur
3fc8e2cf4c Merge pull request #6130 from aternatik/bug-6129 
FIX #6129 : correct test on database connection
 2016-12-10 23:19:07 +01:00
Laurent Destailleur
0f2963d05b Merge pull request #6123 from atm-maxime/mko_multicurrency_debug 
Fix multicurrency - Part 1
 2016-12-10 23:16:14 +01:00
Laurent Destailleur
f70c4e4d23 Merge pull request #6126 from aspangaro/5.0-b6 
Fix presentation on warehouse card
 2016-12-10 23:15:13 +01:00
jfefe
d5128a1889 FIX #6129 : correct test on database connection 2016-12-10 23:12:03 +01:00
Laurent Destailleur
f321d4a77d Merge pull request #6125 from defrance/patch-55 
bad rights on  create order
 2016-12-10 23:11:55 +01:00
Laurent Destailleur
09520d814a Fix columns hidden 2016-12-10 23:08:11 +01:00
Laurent Destailleur
5a35588b63 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-12-10 22:59:19 +01:00
Laurent Destailleur
5120093872 FIX balance of TR 2016-12-10 22:58:55 +01:00
BENKE Charlie
8589f077c0 Bad return on linkback 2016-12-10 22:54:13 +01:00
Maxime Kohlhaas
466f89930e Merge branch 'develop' of github.com:Dolibarr/dolibarr into mko_multicurrency_debug 2016-12-10 22:42:17 +01:00
Maxime Kohlhaas
194639c30e Missing lang in admin 2016-12-10 22:41:57 +01:00
Juanjo Menent
5a2b8ff53c FIX #5853 $conf->global->$calc==0 || $conf->global->$calc==1 2016-12-10 22:41:53 +01:00
Maxime Kohlhaas
3ab23ecb7e Better currency rate setup 2016-12-10 22:40:25 +01:00
aspangaro
31fcf9aff9 Fix warehouse presentation 2016-12-10 22:13:06 +01:00
BENKE Charlie
85f532f0be bad rights on create order 2016-12-10 22:12:41 +01:00
Maxime Kohlhaas
7c82b18da0 New : allow to actualize currency rate 2016-12-10 22:07:25 +01:00
Laurent Destailleur
d1a41c50d0 FIX #6121 2016-12-10 22:07:11 +01:00
Maxime Kohlhaas
9f045eb996 Missing comments 2016-12-10 22:07:05 +01:00
Laurent Destailleur
f21344eee0 Merge pull request #6120 from philippe-opendsi/develop 
FIX : Display invalid message when save payment in invoice currency
 2016-12-10 21:58:45 +01:00
Laurent Destailleur
0486815403 Merge pull request #6122 from aspangaro/5.0-b4 
Bank : Detail of a banking writing more responsive (Remove rowspan)
 2016-12-10 21:58:08 +01:00
aspangaro
b23667b2e6 Fix presentation on loan payment card 2016-12-10 21:53:24 +01:00
aspangaro
14ce1bf3a6 Add information on bank payment tab 
Need fk_user_modif and dater in 6.0
 2016-12-10 21:52:33 +01:00
Maxime Kohlhaas
1f48e0486f Merge branch 'develop' of github.com:Dolibarr/dolibarr into mko_multicurrency_debug 2016-12-10 21:50:31 +01:00
aspangaro
896fbfe2ca Bank : Detail of a banking writing more responsive (Remove rowspan) 2016-12-10 20:59:25 +01:00
Laurent Destailleur
2dda1d7c74 Merge pull request #6116 from simnandez/develop 
Fix: fails to load image to redim into photo resize
 2016-12-10 20:00:52 +01:00
Laurent Destailleur
4f86bb0e5b Merge pull request #6119 from defrance/patch-53 
Better display on internal/external module info
 2016-12-10 20:00:32 +01:00