Laurent Destailleur
|
60bfbe2e57
|
Merge pull request #15448 from Givriz/dev
Feature : creation of a "button-save" class
|
2020-11-21 23:44:30 +01:00 |
|
Francis Appels
|
064b5acff5
|
List supplier barcode
|
2020-11-20 17:16:49 +01:00 |
|
Givriz
|
c48129e279
|
Ajout de la class "button-save"
Ajout de cette class sur les boutons pour pour cloturer une issue ouverte (feature)
|
2020-11-19 20:23:38 +01:00 |
|
Laurent Destailleur
|
47b3b30aaa
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/facture/card.php
htdocs/fourn/product/list.php
htdocs/product/fournisseurs.php
htdocs/societe/card.php
|
2020-11-10 11:10:35 +01:00 |
|
Laurent Destailleur
|
924923ec41
|
Fix warning
|
2020-11-07 19:48:42 +01:00 |
|
Laurent Destailleur
|
6080e5335f
|
Minor fix
|
2020-11-05 12:56:20 +01:00 |
|
Scrutinizer Auto-Fixer
|
ab25e047c0
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-10-31 17:51:30 +00:00 |
|
Scrutinizer Auto-Fixer
|
7f52920716
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-10-31 13:32:18 +00:00 |
|
Laurent Destailleur
|
f54f67cae3
|
Fix sanitizing
|
2020-10-27 19:06:41 +01:00 |
|
Frédéric FRANCE
|
5a3780e062
|
end of dol_fiche_end
|
2020-10-27 18:19:31 +01:00 |
|
Frédéric FRANCE
|
9a470fa42d
|
replace deprecated
|
2020-10-22 22:50:03 +02:00 |
|
Laurent Destailleur
|
3805a7877b
|
Update fournisseurs.php
|
2020-10-12 13:05:18 +02:00 |
|
Florian HENRY
|
c3a900a41c
|
need to update packaging quantity
|
2020-10-12 11:44:12 +02:00 |
|
Florian HENRY
|
df4b208de1
|
fix: add missing edit field with pakaging option on
|
2020-10-12 11:10:49 +02:00 |
|
Laurent Destailleur
|
c659379307
|
Try a more complete fix than #14821
|
2020-09-27 17:21:49 +02:00 |
|
Christian Foellmann
|
be05a44860
|
fix selectbox for table columns supplier prices
|
2020-09-24 11:49:59 +02:00 |
|
Laurent Destailleur
|
bfbb217607
|
Fix GETPOST on 'action'
|
2020-09-16 19:39:50 +02:00 |
|
Laurent Destailleur
|
c761b829b4
|
Merge pull request #14659 from Tim-Otte/feature-filterable-purchase-price-table-columns
NEW Purchase price table: Added filterable table columns
|
2020-09-09 18:55:55 +02:00 |
|
stickler-ci
|
a9a95c8a83
|
Fixing style errors.
|
2020-09-07 13:47:26 +00:00 |
|
Tim Otte
|
c6cb179447
|
Added filterable table columns
|
2020-09-07 15:43:36 +02:00 |
|
Laurent Destailleur
|
4ecd15b7ab
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/fourn/commande/card.php
htdocs/langs/en_US/main.lang
|
2020-08-27 21:57:42 +02:00 |
|
Alexandre SPANGARO
|
142ce7c03f
|
Fix Missing language key
|
2020-08-21 04:58:21 +02:00 |
|
Laurent Destailleur
|
96c583b84e
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-07-10 02:28:34 +02:00 |
|
Laurent Destailleur
|
6b5f46624c
|
Fix label of AWP
|
2020-07-09 16:19:40 +02:00 |
|
Frédéric FRANCE
|
b41ac00b98
|
add new rule
|
2020-05-21 15:05:19 +02:00 |
|
Frédéric FRANCE
|
a25ed0e041
|
add new rule
|
2020-05-21 01:56:06 +02:00 |
|
Scrutinizer Auto-Fixer
|
1bf5745286
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-04-25 11:52:07 +00:00 |
|
Scrutinizer Auto-Fixer
|
444c293c01
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-04-10 08:59:32 +00:00 |
|
Laurent Destailleur
|
83af4ebea4
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
htdocs/product/stock/class/entrepot.class.php
htdocs/product/stock/list.php
|
2020-04-10 01:22:22 +02:00 |
|
stickler-ci
|
50b789456d
|
Fixing style errors.
|
2020-04-08 14:03:16 +00:00 |
|
atm-quentin
|
64f6542f96
|
FIX buyprice extrafield langfile and tooltip
|
2020-04-08 15:59:10 +02:00 |
|
Laurent Destailleur
|
20fad86520
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/cashcontrol/cashcontrol_card.php
|
2020-03-26 00:14:06 +01:00 |
|
Laurent Destailleur
|
51f8c5ca87
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
htdocs/core/class/commoninvoice.class.php
htdocs/expensereport/list.php
htdocs/fourn/class/fournisseur.product.class.php
htdocs/product/fournisseurs.php
|
2020-03-25 19:01:56 +01:00 |
|
Regis Houssin
|
45579b0986
|
FIX remove unused var, $usercancreate can be change by Multicompany
|
2020-03-23 07:01:23 +01:00 |
|
Pierre Ardoin
|
26f6f04486
|
forgot ";"
|
2020-03-17 10:08:18 +01:00 |
|
Pierre Ardoin
|
564f412957
|
correction due to comments @hregis and @eldy
|
2020-03-17 10:04:43 +01:00 |
|
Pierre Ardoin
|
8476477137
|
add const NOTMODIFYOTHERENTITYFOURNPRICE
if const NOTMODIFYOTHERENTITYFOURNPRICE, can't modify other shared fourn prices.
|
2020-02-27 09:19:39 +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 |
|
VESSILLER
|
6e9bb5d7da
|
FIX sql bad request in product buying price extrafields
|
2020-01-03 20:49:54 +01:00 |
|
VESSILLER
|
9c4d7044a3
|
FIX sql bad request in product buying price extrafields
|
2019-12-26 16:18:26 +01:00 |
|
Laurent Destailleur
|
f44b85f557
|
Fix $_SESSION['newtoken'] must be newToken()
|
2019-12-18 23:12:31 +01:00 |
|
Laurent Destailleur
|
ce47de453e
|
Fix HTML5
|
2019-12-12 10:31:08 +01:00 |
|
stickler-ci
|
5d051cc901
|
Fixing style errors.
|
2019-11-25 07:08:22 +00:00 |
|
atm-greg
|
ce15af0980
|
manage packaging on supplier prices
|
2019-11-23 15:52:34 +01:00 |
|
Laurent Destailleur
|
1f5bea01f5
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/class/html.formother.class.php
htdocs/core/lib/functions.lib.php
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
htdocs/core/modules/facture/doc/pdf_sponge.modules.php
htdocs/core/modules/propale/doc/pdf_azur.modules.php
htdocs/core/modules/propale/doc/pdf_cyan.modules.php
htdocs/fourn/class/fournisseur.product.class.php
htdocs/product/fournisseurs.php
htdocs/user/card.php
|
2019-11-14 21:30:16 +01:00 |
|
Laurent Destailleur
|
7e52c70321
|
FIX Advisory ID: usd20190067
|
2019-11-14 21:16:18 +01:00 |
|
Scrutinizer Auto-Fixer
|
2ecfe41810
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-08 09:53:31 +00:00 |
|
Laurent Destailleur
|
9dc309d59d
|
Merge pull request #12351 from frederic34/patch-15
Update fournisseurs.php
|
2019-11-07 11:31:43 +01:00 |
|
Frédéric FRANCE
|
d1131e6b5a
|
Update fournisseurs.php
|
2019-11-05 22:27:30 +01:00 |
|
Frédéric FRANCE
|
35751a80ab
|
100% centpercent
|
2019-11-05 21:24:41 +01:00 |
|
Frédéric FRANCE
|
534f8712a3
|
Update fournisseurs.php
|
2019-11-02 18:11:18 +01:00 |
|
Laurent Destailleur
|
496f93911f
|
Merge pull request #11821 from Tim-Otte/develop
NEW Extrafields support in product supplier prices
|
2019-11-02 16:19:13 +01:00 |
|
Frédéric FRANCE
|
e93aaa2a75
|
replace deprecated user->societe_id by user->socid
|
2019-10-31 20:46:31 +01:00 |
|
Tim Otte
|
ceb3482204
|
Requested changes implemented
|
2019-10-22 11:36:28 +02:00 |
|
Alexandre SPANGARO
|
91b3bf76fd
|
Merge branch 'develop' into 11.0_https
|
2019-10-01 06:11:43 +02:00 |
|
Laurent Destailleur
|
acfceecda5
|
Merge pull request #11925 from OPEN-DSI/new-product-fournisseurs-units
NEW add units fields in buying price tab of product card
|
2019-09-27 14:17:52 +02:00 |
|
Laurent Destailleur
|
961f2b5165
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/categories/viewcat.php
htdocs/fourn/class/fournisseur.product.class.php
htdocs/takepos/invoice.php
|
2019-09-24 14:25:02 +02:00 |
|
Laurent Destailleur
|
6431e8e16d
|
FIX SQL injection on qty
|
2019-09-24 12:43:44 +02:00 |
|
Alexandre SPANGARO
|
02dbc11f98
|
Move Gnu.org to https
|
2019-09-23 21:55:30 +02:00 |
|
VESSILLER
|
ca18448b48
|
NEW add units fields in buying price tab of product card
|
2019-09-18 10:36:13 +02:00 |
|
Tim Otte
|
0f9b01cd5b
|
Added support for extrafield styling options:
- visibility now implemented
- fieldrequired now implemented
|
2019-09-05 09:47:40 +02:00 |
|
Tim Otte
|
be000b96ee
|
Fixed error that occurred in the travis CI build
|
2019-09-04 16:42:13 +02:00 |
|
Tim Otte
|
fbafbc3e19
|
Added myself to the author list
|
2019-09-04 15:16:29 +02:00 |
|
Tim Otte
|
54d0b94b6d
|
Added extrafield support to the product supplier price lines
|
2019-09-04 15:13:42 +02:00 |
|
Abbes Bahfir
|
f945ec5771
|
fix: convert posted price formatted values to numeric
|
2019-09-02 21:24:53 +01:00 |
|
Laurent Destailleur
|
3339f89fc5
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/api/class/api_login.class.php
htdocs/dav/fileserver.php
|
2019-08-22 12:45:23 +02:00 |
|
Laurent Destailleur
|
27cd6cd308
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
htdocs/compta/paiement.php
htdocs/product/fournisseurs.php
htdocs/stripe/payment.php
|
2019-08-22 12:39:07 +02:00 |
|
Laurent Destailleur
|
a35f010e55
|
FIX name and position of hook FIX #11710
|
2019-08-22 12:30:14 +02:00 |
|
Laurent Destailleur
|
adb3062a9f
|
Work on nblignes -> nblines
|
2019-06-29 16:38:14 +02:00 |
|
atm-quentin
|
7f62fdbfe4
|
FIX buyprice barcode default val
|
2019-06-25 14:27:44 +02:00 |
|
atm-quentin
|
4b3824a1a9
|
FIX buyprice barcode default val
|
2019-06-25 14:17:31 +02:00 |
|
Laurent Destailleur
|
22e897b1a1
|
Clean and prepare code to fix a SQL injection
|
2019-05-21 17:22:38 +02:00 |
|
Laurent Destailleur
|
fd5048ef73
|
Fix reported by phpstan
|
2019-05-15 19:16:48 +02:00 |
|
Laurent Destailleur
|
49d65710ba
|
Fix date missing
|
2019-05-14 10:31:11 +02:00 |
|
Laurent Destailleur
|
04f7261bfc
|
Fix field date was not visible
|
2019-05-13 21:34:30 +02:00 |
|
Regis Houssin
|
8a29d9f2d1
|
FIX possibility to override permissions (multicompany)
|
2019-05-10 11:23:19 +02:00 |
|
ATM-Nicolas
|
6cfdfe8408
|
NEW : Can update product supplier price ref
|
2019-04-19 10:58:18 +02:00 |
|
Laurent Destailleur
|
7c59629e66
|
Fix phpcs
|
2019-03-15 02:32:21 +01:00 |
|
Laurent Destailleur
|
86c5dc20e3
|
NEW Can choose the root category to show for TakePOS module
|
2019-03-15 02:12:40 +01:00 |
|
Laurent Destailleur
|
2713c430df
|
Merge branch 'develop' into dev_datepricefour
|
2019-03-14 18:43:09 +01:00 |
|
Laurent Destailleur
|
5aee322b30
|
Update fournisseurs.php
|
2019-03-14 18:36:05 +01:00 |
|
atm-quentin
|
f51b89def3
|
NEW supplier buyprice barcode
|
2019-02-27 09:22:34 +01:00 |
|
Frédéric FRANCE
|
a1d2d3bddc
|
replace html code by html5
|
2019-02-24 11:18:55 +01:00 |
|
Laurent Destailleur
|
648eea3a70
|
Merge branch 'develop' into nospaceaftercomma
|
2019-01-30 16:00:11 +01:00 |
|
Alexandre SPANGARO
|
cc88c4f8ff
|
Move my email to the new one
|
2019-01-28 21:39:22 +01:00 |
|
Frédéric FRANCE
|
b10558bacd
|
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
|
2019-01-27 23:23:38 +01:00 |
|
Frédéric FRANCE
|
7ee086b402
|
PSR2 space after comma in function call
|
2019-01-27 11:55:16 +01:00 |
|
Frédéric FRANCE
|
6e91b3cefc
|
PSR2 usage of else if is discouraged
|
2019-01-27 10:49:34 +01:00 |
|
Francis Appels
|
7ad48064be
|
Add code to show in fourn price tooltip.
|
2019-01-22 16:18:25 +01:00 |
|
Philippe GRAND
|
621b42e8e3
|
update with html5 compliant code
|
2019-01-21 10:02:11 +01:00 |
|
Regis Houssin
|
89389baeac
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_email
|
2018-11-09 15:37:29 +01:00 |
|
Laurent Destailleur
|
f1193ad3dd
|
FIX: Missing date creation and modification of supplier price
|
2018-11-09 10:29:22 +01:00 |
|
Laurent Destailleur
|
4a25317f10
|
Fix security on GETPOST('action'). Param must be sanitized.
|
2018-11-05 20:29:07 +01:00 |
|
Laurent Destailleur
|
c0f4ec5a3e
|
FIX sanitize param $action
|
2018-11-05 17:53:31 +01:00 |
|
Regis Houssin
|
569d59d251
|
FIX change my deprecated email
|
2018-10-27 14:43:12 +02:00 |
|
Laurent Destailleur
|
3ebfb23407
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
.travis.yml
htdocs/fourn/class/fournisseur.facture.class.php
htdocs/product/fournisseurs.php
htdocs/ticket/class/ticket.class.php
|
2018-08-29 20:22:50 +02:00 |
|
Laurent Destailleur
|
d40e1a0d0b
|
FIX #9258
|
2018-08-29 20:12:38 +02:00 |
|
Philippe GRAND
|
57f51fda3e
|
Standardize
|
2018-08-15 12:48:13 +02:00 |
|
atm-greg
|
294045daed
|
update description without multicurrency
|
2018-08-07 10:16:04 +02:00 |
|
atm-greg
|
ad5f59822e
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into Add_supplier_product_description
|
2018-08-07 09:33:30 +02:00 |
|