6c1ba8e2c3
Merge branch '15.0.2_oine' into 15.0.3_oine
2022-10-02 12:08:59 +04:00
Laurent Destailleur
f032a89c49
Merge pull request #21566 from FHenry/15_fix_21553
...
fix : #21553 , fourn prod Id is required to find packaging value
2022-07-24 15:50:17 +02:00
Florian HENRY
3af167db6c
fix : #21553 , fourn prod Id is required to find emballage value
2022-07-23 13:54:07 +02:00
spooky360
5d75ea015b
Added "$object" parameter to $formfile->showdocuments call
...
Added "$object" parameter to $formfile->showdocuments call in order to use the $object reference on the showDocuments hook called inside showdocuments function.
Otherwise, the hook is called with a null reference.
2022-07-22 09:51:57 +02:00
Laurent Destailleur
9db3c1bbd6
Fix currency missing
2022-07-08 10:56:36 +02:00
Laurent Destailleur
76e3c10c06
Revert "fix page titles"
2022-07-06 15:56:04 +02:00
Christian Foellmann
89d1389e2d
fix page titles
2022-06-27 12:48:04 +02:00
948f0c32b6
Supplier order dispatch : retrieve line price from order when deleting dispatch line.
...
This will allows custom cost price to be reverted back in triggers and such later.
2022-06-24 12:59:04 +04:00
Laurent Destailleur
c0240ae996
Merge
2022-06-23 12:24:34 +02:00
Laurent Destailleur
d60d296dd0
phpcs
2022-06-23 11:49:40 +02:00
atm-lena
a94e39f0f4
Merge branch '14.0' of https://github.com/Dolibarr/dolibarr into 14.0_FIX_productfournprice_saveextrafieldsvalues
2022-06-21 16:38:09 +02:00
atm-lena
d99adae850
Product Fourn Price : fix error save extrafields values
2022-06-21 16:34:23 +02:00
Francis Appels
74346c6480
Fix sql error when PRODUCT_USE_SUPPLIER_PACKAGING enabled.
2022-05-31 16:59:57 +02:00
Maxime Kohlhaas
755bce9fe1
Fix : date_creation must have visible=-2
2022-05-21 00:22:47 +02:00
Laurent Destailleur
307476786c
Fix label of remain to pay on vendor invoices
...
FIX tool to fix bank account not in main currency for vendor invoice
2022-04-19 23:24:08 +02:00
Laurent Destailleur
da0fcb556f
Fix css
2022-04-09 15:28:01 +02:00
Laurent Destailleur
d6860ca41b
FIX bad bank amount in accounting with multicurrency
2022-04-09 02:22:45 +02:00
Laurent Destailleur
40ad12c3c3
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
2022-04-05 15:29:54 +02:00
Gauthier PC portable 024
b199234afe
FIX : each time we create a supplier order, we need to give it a ref_supplier
2022-04-05 12:01:09 +02:00
Laurent Destailleur
d0ee40e55d
# WARNING: head commit changed in the meantime
...
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
2022-04-01 14:39:10 +02:00
Gauthier PC portable 024
684e816ac3
FIX : incrementation
2022-03-30 14:12:16 +02:00
Gauthier PC portable 024
6480877b99
FIX : We need to have a different default_ref_supplier for each new fourn invoice
2022-03-30 10:01:17 +02:00
Gauthier PC portable 024
b7e7c95d2a
FIX : ref_client doesn't exists on supplier invoice, then ref_fourn needs to have a default value when we want to bill several supplier orders
2022-03-29 16:02:39 +02:00
Laurent Destailleur
488b35d096
Merge pull request #20232 from hregis/fix_missing_advanced_perms
...
FIX missing advanced perms
2022-03-24 20:32:58 +01:00
Ferran Marcet
ccf8b01020
Fix: The origin of the stock movement is not being recorded
2022-03-22 13:46:55 +01:00
Laurent Destailleur
ed631b2b06
Fix doxygen, missing error message
2022-03-18 16:14:20 +01:00
Laurent Destailleur
167df9593b
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
...
Conflicts:
htdocs/comm/action/card.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/langs/en_US/products.lang
htdocs/reception/class/reception.class.php
2022-03-17 19:08:51 +01:00
Laurent Destailleur
e46ee982ec
FIX Option to manage packaging. FIX size/length/volume of reception
...
Conflicts:
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/install/mysql/migration/14.0.0-15.0.0.sql
htdocs/langs/en_US/products.lang
htdocs/reception/card.php
htdocs/reception/class/reception.class.php
2022-03-17 19:00:19 +01:00
Sylvain Legrand
e97932301b
DLC and DLUO are reversed in the called function
2022-03-16 22:15:49 +01:00
Regis Houssin
e59befa76b
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into fix_missing_advanced_perms
2022-03-11 10:46:14 +01:00
Frédéric FRANCE
543c475a71
clean comment
2022-03-06 10:56:17 +01:00
Laurent Destailleur
c45d6a3bc7
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
2022-03-04 19:45:02 +01:00
Laurent Destailleur
444abbbc0e
Fix regression
2022-03-04 16:44:33 +01:00
Regis Houssin
e5fd11c8e0
FIX missing advanced perms
2022-03-01 09:28:38 +01:00
Laurent Destailleur
b0f538387e
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
...
Conflicts:
htdocs/accountancy/class/bookkeeping.class.php
htdocs/core/modules/import/import_csv.modules.php
htdocs/core/modules/import/import_xlsx.modules.php
2022-02-18 21:50:08 +01:00
Henry
c32cc660a3
Update list.php
2022-02-18 08:16:56 +08:00
Laurent Destailleur
2b65ba4a45
FIX insert free price using price without tax on order
2022-02-10 15:03:41 +01:00
Laurent Destailleur
a295725368
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
2022-02-10 11:23:45 +01:00
Laurent Destailleur
8db6152a4d
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
2022-02-10 11:23:00 +01:00
Laurent Destailleur
6c8fafddf6
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
...
Conflicts:
htdocs/fourn/class/fournisseur.commande.class.php
2022-02-10 11:22:31 +01:00
Laurent Destailleur
7a1c4172a6
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
...
Conflicts:
htdocs/fourn/class/fournisseur.commande.class.php
2022-02-10 11:20:09 +01:00
Laurent Destailleur
793e43c7c6
Update fournisseur.commande.class.php
2022-02-10 09:29:11 +01:00
noec764
d9bac75a63
Merge branch '12.0' into 12.0_Fix_Double_CommandeFournisseurDet
2022-02-09 15:33:45 +01:00
Noé Courtier
e4c1978e12
Change of SQL request when fetching CommandeFournisseurLigne
2022-02-09 12:24:33 +01:00
atm-greg
4c6fd42e3a
fix with eldy recommendations
2022-02-09 09:47:48 +01:00
atm-greg
6035a374b7
fix bad array index
2022-02-02 14:44:38 +01:00
Laurent Destailleur
f9cb209262
Fix max nb of lines in supplier index page
2022-01-31 12:18:04 +01:00
Laurent Destailleur
ef70777cf1
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
...
Conflicts:
htdocs/reception/card.php
2022-01-28 15:57:09 +01:00
Laurent Destailleur
4b5792899e
FIX Presentation of qty already order duplicated on reception card
2022-01-28 15:51:18 +01:00
Laurent Destailleur
daca510fa6
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
...
Conflicts:
build/docker/docker-compose.yml
2022-01-23 18:52:47 +01:00