Commit Graph

12794 Commits

Author SHA1 Message Date
Laurent Destailleur
670465fcd8 Fix responsive and search 2017-12-01 12:01:17 +01:00
Laurent Destailleur
6796c08cb8 Debug/rewrite Blockedlog 2017-11-30 14:21:55 +01:00
Laurent Destailleur
39fdd1b37d Use correct link to changelog 2017-11-30 11:16:28 +01:00
Laurent Destailleur
3b98a06ebb Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/modules/mailings/fraise.modules.php
2017-11-28 12:18:01 +01:00
Laurent Destailleur
07bdd3213a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-11-28 12:16:13 +01:00
Laurent Destailleur
430c72bf0f
Merge pull request #7879 from ptibogxiv/patch-7
fix for multicompany in mailing
2017-11-28 12:16:00 +01:00
Laurent Destailleur
c1e6d35ca5
Merge pull request #7878 from atm-florian/dev_informize_extrafield_list_search
factorization of extrafields into list
2017-11-28 12:14:47 +01:00
Laurent Destailleur
f8d6897888 Fix bug 2017-11-28 12:08:04 +01:00
Laurent Destailleur
b14cb7a97f Debug accountancy 2017-11-28 11:49:11 +01:00
Laurent Destailleur
a15a57317b Debug accountancy module 2017-11-28 11:12:13 +01:00
Laurent Destailleur
a9d3e90b70 Big debug of accountancy module 2017-11-27 21:53:22 +01:00
ptibogxiv
10b0eafba7
Update fraise.modules.php 2017-11-27 18:12:52 +01:00
Laurent Destailleur
533a82187a NEW Add a protection so we can't journalize non balanced transactions 2017-11-27 17:12:48 +01:00
ptibogxiv
ea9071512d
Update fraise.modules.php 2017-11-27 17:08:15 +01:00
ptibogxiv
0a5a50263d
fix for multicompany 2017-11-27 16:07:40 +01:00
Laurent Destailleur
57d4f28cba Enhance usability of accounting module 2017-11-27 15:51:28 +01:00
ptibogxiv
a9e4fcfdca
Update fraise.modules.php 2017-11-27 15:49:28 +01:00
florian HENRY
94285ae494 factorization of extrafeild into list 2017-11-27 15:24:29 +01:00
ptibogxiv
780e8ce470
fix for multicompany 2017-11-27 15:13:14 +01:00
Laurent Destailleur
b55d085f2d
Merge pull request #7872 from atm-alexis/fix_include_for_ajax_select_product_supplier_order
fix include for ajax select product supplier order
2017-11-27 14:55:11 +01:00
Laurent Destailleur
807bfbb696
Merge pull request #7867 from frederic34/bank
info bank
2017-11-27 14:50:00 +01:00
Scrutinizer Auto-Fixer
aab2799981 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2017-11-27 13:48:36 +00:00
Laurent Destailleur
f9e99e93c3 Fux utf8 trouble on direct printing message 2017-11-27 14:34:29 +01:00
Laurent Destailleur
69725fe62f Fix setup of direct print with google docs driver 2017-11-27 13:55:27 +01:00
Laurent Destailleur
43c60ec224 Fix error management at wrong place 2017-11-27 13:45:59 +01:00
alexis Algoud
61a3131fc4 fix include for ajax select product supplier order 2017-11-27 10:59:46 +01:00
Laurent Destailleur
b142ac1c06 CSS 2017-11-26 22:12:11 +01:00
Laurent Destailleur
e4d0213916 Removed duplicate code 2017-11-26 22:06:14 +01:00
Laurent Destailleur
a0406bc741 Standardize view of events for products 2017-11-26 20:24:20 +01:00
Laurent Destailleur
7e40ee5e4b Fix substitution key for constant ok with php 5.3 2017-11-25 23:16:15 +01:00
Laurent Destailleur
c02528a479 NEW Accept substitution key __[ABC]__ replaced with value of const ABC 2017-11-25 19:55:31 +01:00
Laurent Destailleur
5935ad868a Fix the from robot must be visible only on test page 2017-11-25 19:23:27 +01:00
Laurent Destailleur
3d48e509bd Clean code 2017-11-25 19:16:15 +01:00
Laurent Destailleur
2fc5d9fefb The form to test email can now use all sending profiles. 2017-11-25 18:52:47 +01:00
Laurent Destailleur
e6b16815aa Fix responsive 2017-11-25 17:25:27 +01:00
Laurent Destailleur
e1484caa59 Fix responsive 2017-11-25 17:21:53 +01:00
Laurent Destailleur
1ea9137863 Fix sort order 2017-11-25 16:21:44 +01:00
Laurent Destailleur
5ba4a57b61 Fix sort on last actions 2017-11-25 16:05:45 +01:00
Frédéric FRANCE
6a91b16995
info bank 2017-11-25 12:13:03 +01:00
Laurent Destailleur
0b9a3087ea Fix bug reported by scrutinizer 2017-11-25 12:11:02 +01:00
Laurent Destailleur
412c4e335d Fix method of herited object has same signature than parent 2017-11-25 11:10:52 +01:00
Laurent Destailleur
88841ccbae FIX #7590 2017-11-25 01:58:11 +01:00
Laurent Destailleur
b8251bac97 Fix rename files with accents 2017-11-25 00:48:19 +01:00
Laurent Destailleur
4cff4c6935 Simplify and standardize code for agenda pages 2017-11-25 00:12:45 +01:00
Laurent Destailleur
c16a150a70 NEW Remove background on agenda view when event is a not busy event. 2017-11-24 20:02:46 +01:00
Laurent Destailleur
7ea96d53a2 Minor fixes 2017-11-24 18:12:01 +01:00
Laurent Destailleur
63d2d38c5f Fix export stock with lot 2017-11-24 17:47:40 +01:00
Laurent Destailleur
8659d97e97 Fix export of lot must use properties of lot from product_lot 2017-11-24 17:44:19 +01:00
Laurent Destailleur
4f4f929efb Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/facture/class/facture.class.php
	htdocs/holiday/class/holiday.class.php
2017-11-24 17:02:14 +01:00
Laurent Destailleur
2493c2468d Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
Conflicts:
	htdocs/core/class/conf.class.php
	htdocs/core/lib/files.lib.php
2017-11-24 16:51:59 +01:00