Laurent Destailleur
7afbb5ce9c
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2020-03-11 17:00:01 +01:00
Laurent Destailleur
467dc2da7a
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
2020-03-11 16:59:35 +01:00
Laurent Destailleur
4bdf10c995
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
2020-03-11 16:44:03 +01:00
Laurent Destailleur
c8bbaa07fd
FIX Look and feel v11
2020-03-11 15:53:08 +01:00
atm-lena
20aa51f26b
FIX - Clone Fourn Command, add line's extrafields Part 2
2020-03-11 15:26:49 +01:00
atm-lena
35f32391a0
FIX - Clone Fourn Command, add line's extrafields
2020-03-10 14:46:15 +01:00
Laurent Destailleur
0bd2740779
NEW Can force position of legend of graph on right (instead of top)
2020-03-05 17:23:19 +01:00
Laurent Destailleur
a6d340a22c
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/adherents/class/adherent.class.php
htdocs/filefunc.inc.php
2020-03-04 19:28:15 +01:00
Laurent Destailleur
ddc0547eda
Fix position of button
2020-03-04 13:31:19 +01:00
Laurent Destailleur
2b6aaa652d
Merge pull request #13256 from ATM-Marc/NEW_list_multicurrency
...
NEW: add multicurrency columns to document lists
2020-03-03 23:12:53 +01:00
Laurent Destailleur
7866f89585
Merge pull request #13260 from atm-quentin/FIX_ecm_files
...
FIX ecm_files didnt match cause document ref contained "/"
2020-03-03 23:09:02 +01:00
atm-quentin
9446138951
FIX ecm_files didnt match cause document ref contained "/"
2020-03-03 12:07:18 +01:00
Marc de Lima Lucio
b58608dab0
NEW: supplier order list: enable multicurrency columns
2020-03-03 09:56:25 +01:00
Marc de Lima Lucio
1c912659eb
NEW: supplier invoice list: enable multicurrency columns
2020-03-03 09:38:05 +01:00
Pierre Ardoin
74ac69fc5a
Add Entity in list_product_fournisseur_price()
...
Select too the entity value to add const NOTMODIFYOTHERENTITYFOURNPRICE
2020-02-27 09:16:15 +01:00
Laurent Destailleur
0646b1a7a9
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/ihm.php
2020-02-26 17:04:14 +01:00
Laurent Destailleur
ec108162e3
Fix GETPOST
2020-02-25 15:14:37 +01:00
Laurent Destailleur
457d0668c8
Look and feel v12
2020-02-24 05:23:34 +01:00
Scrutinizer Auto-Fixer
e44865d8b5
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-02-21 16:53:37 +00:00
Laurent Destailleur
55bef402c4
Fix remove a lot of warnings on Eclipse
2020-02-21 17:47:36 +01:00
Laurent Destailleur
44eda2d4ad
Fix doxygen
2020-02-20 13:42:43 +01:00
Laurent Destailleur
895503d2eb
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/comm/index.php
htdocs/core/class/CMailFile.class.php
2020-02-20 00:21:25 +01:00
Laurent Destailleur
d0d352be1a
FIX #13118
2020-02-19 03:37:28 +01:00
Laurent Destailleur
2ac064059a
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/langs/en_US/admin.lang
htdocs/projet/element.php
2020-02-18 22:40:43 +01:00
Laurent Destailleur
31ae0bc06e
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/fourn/commande/index.php
htdocs/product/card.php
2020-02-18 22:38:30 +01:00
atm-ph
bb64d2d353
Fix create supplier invoice from supplier order don't keep source object as linked obkect
2020-02-18 16:00:12 +01:00
Regis Houssin
110a23623b
FIX an external user can not approved
2020-02-18 11:04:11 +01:00
Regis Houssin
4511cf1060
FIX missing "statut" for getNomUrl() function
2020-02-18 09:03:25 +01:00
Regis Houssin
1034e4a472
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0_mc2
2020-02-18 09:02:35 +01:00
Regis Houssin
f6f0d9d4a2
FIX better method to check user rights AND usergroup rights !
2020-02-18 08:35:51 +01:00
Regis Houssin
a5de331410
FIX Multicompany compatibility
2020-02-17 19:13:37 +01:00
Laurent Destailleur
f4f3efec62
Fight against $_POST
2020-02-16 19:33:58 +01:00
Laurent Destailleur
35ada37d4d
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
htdocs/comm/propal/list.php
htdocs/filefunc.inc.php
2020-02-14 19:14:26 +01:00
Laurent Destailleur
bb895cb1d8
FIX ref_client not visible in tooltip.
2020-02-13 18:00:59 +01:00
Laurent Destailleur
a4f13194c3
Merge pull request #12503 from atm-greg/New_Supplier_Packaging
...
NEW Experiment supplier packaging with option PRODUCT_USE_SUPPLIER_PACKAGING: Using price according to the minimum quantity
2020-02-13 10:50:56 +01:00
Laurent Destailleur
7f146111d2
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-02-11 19:20:46 +01:00
Laurent Destailleur
aa9ffbba05
Fix missing fields property
2020-02-11 19:18:36 +01:00
Laurent Destailleur
74d3912763
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/fourn/class/fournisseur.facture.class.php
2020-02-11 16:52:58 +01:00
AdrianDominik
5432ab3b05
FIX : #13018 Extrafields Supplier invoice
2020-02-10 11:18:59 +01:00
atm-greg
f8ffdea5ae
Merge branch 'develop' of github.com:Dolibarr/dolibarr into New_Supplier_Packaging
2020-02-06 09:59:42 +01:00
Alexandre SPANGARO
d6d3fff9dc
Merge branch 'develop' into 10.0_intracommreport
2020-02-03 21:15:07 +01:00
Laurent Destailleur
4765198af2
Clean code from using deprecated field amount
2020-02-02 19:03:37 +01:00
Scrutinizer Auto-Fixer
5fda829023
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-01-30 00:48:28 +00:00
Laurent Destailleur
9acda3545e
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-28 17:52:01 +01:00
Laurent Destailleur
c87fdc96ce
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
...
Conflicts:
htdocs/accountancy/supplier/index.php
2020-01-28 17:51:32 +01:00
Laurent Destailleur
80707d6a5e
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-28 17:24:26 +01:00
Laurent Destailleur
3a9e238dc6
FIX Missing value of $formconfirm as parameters of hook
2020-01-28 12:00:27 +01:00
Pierre Ardoin
e0c8fce229
Fix link direction for late supplier invoices
...
Before : $response->url_late always == $response->url
After : if $response->nbtodolate >= 1 : $response->url_late redirects to list with only late unpaid supplier invoices.
2020-01-27 09:39:38 +01:00
Laurent Destailleur
df478dc170
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
2020-01-27 01:53:49 +01:00
Laurent Destailleur
ecaacc9543
FIX #12875
2020-01-26 23:27:47 +01:00