Laurent Destailleur
|
e3126ec999
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
htdocs/core/tpl/card_presend.tpl.php
htdocs/multicurrency/class/multicurrency.class.php
htdocs/supplier_proposal/class/supplier_proposal.class.php
|
2020-07-25 00:22:47 +02:00 |
|
Francis Appels
|
c2030a7db5
|
jdate already in function listProductFournisseurPriceLog
So no conversion needed.
|
2020-07-19 09:43:15 +02:00 |
|
Francis Appels
|
1bc1fd4cb4
|
Fix date in supplier price log tooltip.
|
2020-07-15 11:24:11 +02:00 |
|
Laurent Destailleur
|
13eb1ca28d
|
Fix link
|
2020-04-18 04:40:33 +02: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
|
99ddd25ad5
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/product/stock/class/mouvementstock.class.php
htdocs/supplier_proposal/class/supplier_proposal.class.php
|
2020-04-02 16:51:50 +02:00 |
|
Laurent Destailleur
|
19084286be
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
ChangeLog
htdocs/fourn/class/fournisseur.product.class.php
|
2020-04-02 16:49:37 +02:00 |
|
atm-quentin
|
e3dfe60567
|
uniformize update buyprice + some fixes
|
2020-03-31 14:53:15 +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 |
|
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 |
|
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 |
|
atm-greg
|
f8ffdea5ae
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into New_Supplier_Packaging
|
2020-02-06 09:59:42 +01:00 |
|
Laurent Destailleur
|
9a08a6bf6d
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
htdocs/categories/traduction.php
htdocs/compta/facture/class/facture.class.php
htdocs/contact/card.php
htdocs/core/modules/modSociete.class.php
htdocs/fourn/class/fournisseur.product.class.php
htdocs/langs/en_US/products.lang
htdocs/margin/agentMargins.php
htdocs/margin/customerMargins.php
htdocs/margin/productMargins.php
htdocs/margin/tabs/productMargins.php
htdocs/margin/tabs/thirdpartyMargins.php
|
2019-12-23 14:13:26 +01:00 |
|
Laurent Destailleur
|
4d12ecb072
|
FIX #12745
|
2019-12-23 13:40:35 +01:00 |
|
Laurent Destailleur
|
3207add2a6
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/class/html.formfile.class.php
htdocs/fourn/class/fournisseur.product.class.php
|
2019-12-17 12:52:12 +01:00 |
|
Laurent Destailleur
|
2c4fd099c8
|
Update fournisseur.product.class.php
|
2019-12-14 22:27:45 +01:00 |
|
Laurent Destailleur
|
e9a0646f6f
|
Update fournisseur.product.class.php
|
2019-12-14 22:25:34 +01:00 |
|
gauthier
|
cc1454c8d5
|
FIX : product_fourn_price_id was assigned too late for logPrice() function
|
2019-12-13 14:55:39 +01: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
|
ddcc14dc16
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-14 11:09:15 +00:00 |
|
Frédéric FRANCE
|
e75f7d448c
|
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen
|
2019-10-16 20:00:01 +02:00 |
|
Alexandre SPANGARO
|
91b3bf76fd
|
Merge branch 'develop' into 11.0_https
|
2019-10-01 06:11:43 +02:00 |
|
Laurent Destailleur
|
72ea1a2867
|
Merge pull request #11927 from OPEN-DSI/fix-fournisseur-product-display-histo-tooltip
FIX dol_print_date format in buying price tooltip
|
2019-09-27 12:25:26 +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
|
5838fa1229
|
Fix az09 -> aZ09
|
2019-09-24 14:20:45 +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
|
cf7193691f
|
FIX dol_print_date format in buying price tooltip
|
2019-09-18 11:22:32 +02:00 |
|
Laurent Destailleur
|
f53f314211
|
Update fournisseur.product.class.php
|
2019-07-18 17:15:50 +02:00 |
|
Christophe Battarel
|
5daf0316f9
|
also fix bad insert sql command
|
2019-07-18 11:18:25 +02:00 |
|
Christophe Battarel
|
32bc8a5faf
|
FIX fournrprice log for insert
|
2019-07-18 11:05:51 +02:00 |
|
Laurent Destailleur
|
1a6dc83d4c
|
Fix: default accounting account for eec and export sales were not used.
|
2019-06-20 12:25:58 +02:00 |
|
Francis Appels
|
a26c868783
|
Fix scrutinizer bugs
|
2019-06-12 22:05:10 +02:00 |
|
Laurent Destailleur
|
5891d0a056
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/product/list.php
htdocs/projet/list.php
|
2019-04-04 17:45:02 +02:00 |
|
Frédéric FRANCE
|
2fddf38da1
|
correct replacement of align
|
2019-03-19 12:55:33 +01:00 |
|
Philippe Grand
|
8054f61bac
|
Update fournisseur.product.class.php
Oops...to much alcohol..
|
2019-03-16 09:14:57 +01:00 |
|
Philippe GRAND
|
2463ee47ba
|
update with html5 compliant code
|
2019-03-15 09:40:52 +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
|
463c83efec
|
Update fournisseur.product.class.php
|
2019-03-14 18:37:03 +01:00 |
|
Laurent Destailleur
|
8f65ee2296
|
Merge branch 'develop' into NEW_develop_supplier_buyprice_barcode
|
2019-03-14 17:48:44 +01:00 |
|
Laurent Destailleur
|
60db66d2bf
|
Update fournisseur.product.class.php
|
2019-03-14 17:41:33 +01:00 |
|
Laurent Destailleur
|
250e0bbaac
|
Update fournisseur.product.class.php
|
2019-03-14 17:40:39 +01:00 |
|
Laurent Destailleur
|
dd962fa044
|
Update fournisseur.product.class.php
|
2019-03-14 17:39:01 +01:00 |
|
Frédéric FRANCE
|
014f69850e
|
add visibility
|
2019-03-01 23:08:57 +01:00 |
|
Frédéric FRANCE
|
0022c4fe72
|
add visibility
|
2019-02-28 22:44:12 +01:00 |
|
atm-quentin
|
394659f84a
|
missing doc
|
2019-02-27 09:22:47 +01:00 |
|