Commit Graph

13069 Commits

Author SHA1 Message Date
Laurent Destailleur
aeeb787bae
Merge pull request #8135 from atm-arnaud/FIX_contact_order_by_name
FIX order contactlist on Thirdparty by name
2018-02-05 15:14:17 +01:00
arnaud
3c816acb05 FIX order contactlist on Thirdparty by name 2018-02-05 15:06:28 +01:00
Laurent Destailleur
72f6b2956a Fix: pagination into belugo template 2018-02-05 14:31:39 +01:00
Laurent Destailleur
775085e1b8 Border of comment box 2018-02-05 14:10:24 +01:00
Laurent Destailleur
85964e02de Fix css 2018-02-05 12:34:11 +01:00
Laurent Destailleur
10e7517596 Fix missing mainmenu and leftmenu into menu definition 2018-02-05 02:29:19 +01:00
Laurent Destailleur
c02d46fb0a Fix leftmenu in menu entries 2018-02-05 01:33:44 +01:00
Laurent Destailleur
5455ab3280 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
Conflicts:
	htdocs/projet/card.php
2018-02-04 23:17:09 +01:00
Laurent Destailleur
7ed66457b4 Fix ref already output 2018-02-04 13:55:18 +01:00
Laurent Destailleur
5a609215d5 Fix default value was not save at creation
Conflicts:
	htdocs/core/class/extrafields.class.php
2018-02-04 13:23:04 +01:00
Laurent Destailleur
f3700b66c6 Fix size of columns when using PRODUCT_USE_UNIT 2018-02-04 11:17:45 +01:00
Laurent Destailleur
fd8f89c708 FIX a discount is a percent, not an amount, so we use vatrate not price 2018-02-04 11:13:47 +01:00
Laurent Destailleur
c6fba7273d Api interventions 2018-02-03 20:58:26 +01:00
Laurent Destailleur
f57ea2682a Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
Conflicts:
	htdocs/contrat/card.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/notify.class.php
	htdocs/societe/class/societe.class.php
2018-02-03 19:33:24 +01:00
Laurent Destailleur
fa3f06aaaa
Merge pull request #8123 from atm-florian/7.0
fix warning class declaration
2018-02-03 16:33:39 +01:00
Laurent Destailleur
756f8a1b9f
Update modules_expensereport.php 2018-02-03 16:33:27 +01:00
Laurent Destailleur
97a29e87ea Fix pdf template baleine (pb with page breaks and long task desc) 2018-02-03 16:31:36 +01:00
Laurent Destailleur
a41847d084 Fix: date of modificaiton in ledger not visible.
Fix: show hours in date of creation in ledger.
Fix: label in export.
Fix: label in export of draft journal is same than on screen.
Fix: missing line desc in csv export of draft bank journal.
2018-02-02 14:27:07 +01:00
Regis Houssin
13106d34a6 Fix: compatibility with multicompany sharing 2018-02-02 12:36:47 +01:00
Laurent Destailleur
d3a6342034 Fix regeneration of PDF after creation of payment. 2018-02-02 10:37:10 +01:00
Laurent Destailleur
0412d3d11d Fix extrafield mandatory check.Fix empty extrafields with type link. 2018-02-01 19:05:24 +01:00
florian HENRY
5d20af7751 fix warning class declaration 2018-02-01 16:15:57 +01:00
Laurent Destailleur
b2536d8ebb FIX #8110 2018-02-01 15:44:35 +01:00
Laurent Destailleur
ed3bcf59b6 Try doc hint array of array of int with @var int[][] 2018-02-01 10:50:50 +01:00
Laurent Destailleur
0385dfe859 Fix td balance 2018-02-01 00:49:12 +01:00
Laurent Destailleur
b49a7e245c Add hidden option INVOICE_NO_PAYMENT_DETAILS required by some countries 2018-01-31 20:22:19 +01:00
Laurent Destailleur
14ecdce650 Fix merge of thirdparties (pb when merging codes and error management) 2018-01-31 18:01:56 +01:00
Laurent Destailleur
de0a8ba71f Fix extrafields 2018-01-31 14:01:58 +01:00
Laurent Destailleur
e9f8c7ba01 Fix edit of extrafields "link" corrupts the data definition 2018-01-31 10:51:40 +01:00
Laurent Destailleur
d6317a26d2 Fix for multicompany 2018-01-30 15:48:09 +01:00
Laurent Destailleur
0d90ab0c6c Fix when counter is corrupted in database 2018-01-30 14:42:13 +01:00
Laurent Destailleur
06f2382e39 Fix compatibility with old actioncomm record 2018-01-30 11:05:11 +01:00
Laurent Destailleur
8102883356 Fix error when email list contains ', ,'
Fix output dir of notification
2018-01-29 20:36:40 +01:00
Laurent Destailleur
4eb7d7a332 Debug blockedlog with various payments 2018-01-29 18:22:26 +01:00
Laurent Destailleur
65c7117240 Fix var serialized twice 2018-01-27 19:40:42 +01:00
Laurent Destailleur
7dcb3bf6fc Fix var not initialized 2018-01-27 19:40:35 +01:00
Laurent Destailleur
bee64962fe Fix css 2018-01-27 19:40:11 +01:00
Laurent Destailleur
d4e15545b4 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/filefunc.inc.php
2018-01-26 12:10:13 +01:00
Laurent Destailleur
82c2079d40 Fix var not initialized 2018-01-26 10:23:24 +01:00
Laurent Destailleur
c922498e79 Code comment 2018-01-25 20:35:25 +01:00
Laurent Destailleur
e9441f7881 Fix name of log module to avoid confusion with blocked log 2018-01-25 17:56:46 +01:00
Laurent Destailleur
8d7f6843a4 Must be able to export lockedlog for a dedicated year.
Fix date are nto humanly readable.
2018-01-25 12:57:36 +01:00
Laurent Destailleur
005bccc63d Fix missing badge of nb of permissions 2018-01-25 12:06:22 +01:00
Laurent Destailleur
60c1a1e745 Code comment on accesskey 2018-01-24 17:29:29 +01:00
Laurent Destailleur
d796f403a9 Fix sender email when sending a password remind 2018-01-24 15:43:55 +01:00
Laurent Destailleur
9cdb7f0f27 Code comment 2018-01-24 14:37:26 +01:00
Laurent Destailleur
fbeb66fedd Fix refreshing of captcha broken if a cache-control set by server 2018-01-24 13:40:39 +01:00
Laurent Destailleur
64f6e9e5c0 CSS 2018-01-24 12:23:52 +01:00
Laurent Destailleur
561f273900 Minor fix for smartphone 2018-01-24 11:43:34 +01:00
Laurent Destailleur
f1b63d7cbf Fix css 2018-01-23 09:00:03 +01:00