Laurent Destailleur
|
fc37c393ce
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
htdocs/core/actions_massactions.inc.php
|
2019-06-02 12:36:48 +02:00 |
|
Laurent Destailleur
|
57cfb4b007
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
htdocs/core/actions_massactions.inc.php
htdocs/website/class/website.class.php
|
2019-06-02 12:36:07 +02:00 |
|
Laurent Destailleur
|
a20d824b97
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
|
2019-06-02 12:30:34 +02:00 |
|
Laurent Destailleur
|
300f46cb01
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
|
2019-06-02 12:30:25 +02:00 |
|
Laurent Destailleur
|
a1a9313487
|
Merge pull request #11292 from atm-maxime/fix_invoice_from_contract2
Fix : only invoice active lines of a contract
|
2019-06-02 12:29:13 +02:00 |
|
Laurent Destailleur
|
4bbef9b478
|
Update card.php
|
2019-06-02 12:29:05 +02:00 |
|
Laurent Destailleur
|
7020e1ef29
|
Update card.php
|
2019-06-02 12:27:32 +02:00 |
|
Laurent Destailleur
|
d8adda82f9
|
Merge pull request #11291 from AXeL-dev/patch-9
Fix #11256
|
2019-06-02 12:23:27 +02:00 |
|
Laurent Destailleur
|
db7ea5f52a
|
Merge pull request #11284 from atm-maxime/fix_buld_invoice_refclient
Fix : add refclient on bulk invoicing
|
2019-06-02 12:21:24 +02:00 |
|
Laurent Destailleur
|
2b3c5902e6
|
Merge pull request #11281 from atm-maxime/fix_warning_resource
Fix : warnings in resource module
|
2019-06-02 12:17:19 +02:00 |
|
Laurent Destailleur
|
cb927847ab
|
Update dolresource.class.php
|
2019-06-02 12:16:12 +02:00 |
|
Laurent Destailleur
|
40b212d5cc
|
Merge pull request #11280 from atm-maxime/fix_warning_page_var
Fix : avoid warning and uniformize $page var use
|
2019-06-02 12:14:47 +02:00 |
|
Laurent Destailleur
|
190cf8aba5
|
Merge pull request #11279 from atm-maxime/fix_tag_missing_right
Fix : missing rights test to display tag create link
|
2019-06-02 12:14:22 +02:00 |
|
Laurent Destailleur
|
3e9fbf0148
|
Update index.php
|
2019-06-02 12:14:07 +02:00 |
|
Laurent Destailleur
|
b40041146b
|
Merge pull request #11276 from atm-maxime/fix_db_table_prefix
Fix : remove hardcoded llx_ prefix
|
2019-06-02 12:13:33 +02:00 |
|
Laurent Destailleur
|
ea58f8a617
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-06-02 11:49:49 +02:00 |
|
Laurent Destailleur
|
5f0fbcea9a
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/accountancy/admin/productaccount.php
htdocs/contact/card.php
htdocs/core/class/commonobject.class.php
htdocs/core/class/extrafields.class.php
|
2019-06-02 11:49:33 +02:00 |
|
Maxime Kohlhaas
|
916d3ce931
|
Fix : only invoice active lines of a contract
|
2019-06-02 11:00:58 +02:00 |
|
AXeL-dev
|
82b37a514c
|
Fixed empty verification (0 might be considered as empty also, so its better to compare string value with '')
|
2019-06-01 16:27:06 +00:00 |
|
AXeL-dev
|
d2c853c47b
|
Fix #11256
|
2019-06-01 15:00:15 +00:00 |
|
Maxime Kohlhaas
|
d47913ed19
|
Fix : add refclient on bulk invoicing
|
2019-05-31 16:33:32 +02:00 |
|
Maxime Kohlhaas
|
0372276a7b
|
Fix : warnings in resource module
|
2019-05-31 16:04:12 +02:00 |
|
Maxime Kohlhaas
|
6dd01e86e9
|
Fix : avoid warning and uniformize var use
|
2019-05-31 15:53:23 +02:00 |
|
Maxime Kohlhaas
|
9ab2f44946
|
Fix : missing rights test to display tag create link
|
2019-05-31 15:14:56 +02:00 |
|
Maxime Kohlhaas
|
15fd24a511
|
Fix : remove hardcoded llx_ prefix
|
2019-05-31 12:14:51 +02:00 |
|
Laurent Destailleur
|
f2088a084f
|
Fix error management
|
2019-05-31 11:53:30 +02:00 |
|
Laurent Destailleur
|
12c1531b3b
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
|
2019-05-31 11:39:06 +02:00 |
|
Laurent Destailleur
|
cd75794aaa
|
FIX #11169 #11202
|
2019-05-31 11:38:54 +02:00 |
|
Laurent Destailleur
|
7e678f3d83
|
Merge pull request #11272 from hregis/develop_security
FIX missing encrypt llx_const fields
|
2019-05-31 10:57:00 +02:00 |
|
Laurent Destailleur
|
dedd85c8b5
|
Merge pull request #11271 from hregis/9.0_security
FIX missing llx_const encrypt
|
2019-05-31 10:56:24 +02:00 |
|
Laurent Destailleur
|
3dc36d4ab7
|
Merge pull request #11269 from ptibogxiv/patch-183
FIX display job/function in contact list
|
2019-05-31 10:56:02 +02:00 |
|
Francis Appels
|
e496967235
|
Fix scrutinizer, wrong unitprice var
|
2019-05-30 17:30:53 +02:00 |
|
Regis Houssin
|
063fe35c97
|
FIX missing encrypt llx_const fields
|
2019-05-30 11:45:55 +02:00 |
|
Regis Houssin
|
bdd54ae245
|
FIX missing llx_const encrypt
|
2019-05-30 11:42:28 +02:00 |
|
ptibogxiv
|
5b6821c191
|
FIX display job/fucnction in contact list
Display job/function is usefull for correct choice of additionnal contact in a object (PR from returns of severals professionnal dolibarr's user)
|
2019-05-29 16:55:44 +02:00 |
|
Laurent Destailleur
|
f89e72e329
|
Merge pull request #11266 from frederic34/patch-5
Update linkedobjectblock.tpl.php
|
2019-05-29 13:54:28 +02:00 |
|
Laurent Destailleur
|
03feb3604c
|
Merge pull request #11265 from frederic34/patch-2
Update tpl linked invoices
|
2019-05-29 13:54:09 +02:00 |
|
Laurent Destailleur
|
69efc54fb6
|
Merge pull request #11263 from atm-arnaud/9.0_FIX_productaccount_buy_page
FIX productaccount buylist with pages
|
2019-05-29 13:52:53 +02:00 |
|
Laurent Destailleur
|
ab73d8a6fc
|
Merge pull request #11258 from hregis/develop_security
FIX add Windows and Mac executable
|
2019-05-29 13:52:19 +02:00 |
|
Laurent Destailleur
|
e11bd8c70d
|
Merge pull request #11257 from atm-ph/fix_7.0_create_bills_multicurrency
Fix create bills on mass action does not retrieve the original currency
|
2019-05-29 13:51:57 +02:00 |
|
Laurent Destailleur
|
bc030561ac
|
Debug various payment
|
2019-05-29 13:48:00 +02:00 |
|
Laurent Destailleur
|
280a034199
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-05-29 13:15:57 +02:00 |
|
Laurent Destailleur
|
a7dccf1617
|
Merge pull request #11255 from aspangaro/10.0_accountancy2
FIX Lost functionnality - Add category to bank transaction with various payment
|
2019-05-29 13:15:47 +02:00 |
|
Laurent Destailleur
|
cafb3840b7
|
Fix look and feel v10
|
2019-05-29 12:56:11 +02:00 |
|
Laurent Destailleur
|
6a84dfe29e
|
Update card.php
|
2019-05-29 12:34:54 +02:00 |
|
Laurent Destailleur
|
ae597e7b63
|
Merge pull request #11252 from KlaasOl/patch-2
Create llx_accounting_account_nl.sql
|
2019-05-29 12:25:42 +02:00 |
|
Laurent Destailleur
|
8c97fc164f
|
Merge pull request #11253 from KlaasOl/patch-3
Update llx_accounting_abc.sql
|
2019-05-29 12:25:08 +02:00 |
|
Laurent Destailleur
|
b6f4cab20d
|
Merge pull request #11247 from aspangaro/develop
Accountancy - Use Ansi on Agiris model export & indent
|
2019-05-29 12:23:25 +02:00 |
|
Laurent Destailleur
|
05063016e8
|
FIX #11244 Enhance repair tool
|
2019-05-29 12:21:51 +02:00 |
|
Frédéric FRANCE
|
48d15032af
|
Update linkedobjectblock.tpl.php
|
2019-05-29 11:28:07 +02:00 |
|