Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-25 02:41:26 +01:00
Code Issues Packages Projects Releases Wiki Activity
111,448 Commits 36 Branches 191 Tags
724490b94de89a00620e73205bbc2b6453efa924
Commit Graph

429 Commits

Author SHA1 Message Date
Laurent Destailleur
1f2ad8efbf FIX API reception return error 500 2022-09-21 01:13:53 +02:00
Laurent Destailleur
4d46da9514 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-08-31 17:23:03 +02:00
Laurent Destailleur
5d8c7d2f0b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-08-31 15:53:19 +02:00
Frédéric FRANCE
185f8896c5 fix display date creation 2022-08-29 16:52:27 +02:00
Laurent Destailleur
24dc936000 Revert "default to create on card.php if $action is empty" 
This reverts commit e0b664066b.
 2022-07-11 00:05:50 +02:00
Christian Foellmann
e0b664066b default to create on card.php if $action is empty 2022-07-11 00:01:42 +02:00
Laurent Destailleur
cccb453a05 Fix doc 2022-07-10 18:40:53 +02:00
Laurent Destailleur
1a6c690a4a Merge pull request #21482 from thomas-Ngr/14.0_fix_check_batch_on_reception 
check batch on receptions->addline when module is enabled
 2022-07-10 18:40:22 +02:00
Thomas Negre
c0d3aaf445 stickler fix 2022-07-08 15:53:41 +02:00
Thomas Negre
f042a62a1c remove overkill setEventMessage() 2022-07-08 15:47:13 +02:00
Thomas Negre
56ea6989cf check batch on receptions->addline when module is enabled 2022-07-08 15:36:11 +02:00
Quatadah Nasdami
17c9f0a25b shipment not found into reception not found 2022-07-04 14:38:51 +02:00
Quatadah Nasdami
831ff35c4d API for module reception 2022-06-28 16:10:10 +02:00
atm-lena
fe09423d20 FIX compatibility php 8 : compare empty string and zero int for reception 2022-06-23 11:55:20 +02:00
Frédéric France
62c171c26d isModEnabled 2022-06-21 20:54:28 +02:00
Laurent Destailleur
7ce47ce786 Fix signature of getNbByMonth 2022-06-17 15:06:24 +02:00
Laurent Destailleur
08a942dca8 # WARNING: head commit changed in the meantime 
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
 2022-06-17 14:52:51 +02:00
Laurent Destailleur
dd392143e1 Fix conf->projet conf->project 2022-06-14 17:53:17 +02:00
Laurent Destailleur
b5f77b4035 FIX #21237 2022-06-14 17:36:42 +02:00
Laurent Destailleur
6c1c8058c1 Doc 2022-06-14 16:56:03 +02:00
Frédéric France
3fdbce7a31 use isModEnabled function 2022-06-11 09:46:28 +02:00
Francis Appels
eb7fcb2f9b Fix reception list for search date extrafield 2022-06-10 13:24:39 +02:00
Laurent Destailleur
98ec208449 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-06-09 02:48:50 +02:00
Laurent Destailleur
74104285db Debug v16 2022-06-09 02:48:32 +02:00
Laurent Destailleur
b5a1ded537 Merge branch 'develop' into 15_fix_reception_stock_move 2022-06-09 02:41:51 +02:00
Francis Appels
e1f4d99aa6 Debug #18770 edit buy price for WAP update. 2022-06-08 18:27:47 +02:00
Francis Appels
48142c69bd Fix reception re-open with stock rule enabled. 2022-06-08 17:29:40 +02:00
Francis Appels
636d594301 Fix reception set-draft with stock rule enabled. 2022-06-08 17:29:22 +02:00
Laurent Destailleur
352df9254b Merge branch 'develop' into fix_unidentified_lines_array_on_reception_card 2022-05-24 21:45:06 +02:00
Gauthier PC portable 024
2cd52b6ea2 FIX : no thead and tbody on reception lines array 2022-05-23 12:24:51 +02:00
Gauthier PC portable 024
4f572a89d3 FIX : Unidentified lines array on reception card 2022-05-23 11:50:06 +02:00
Maxime Kohlhaas
6131d5a2b4 Fix scrutinizer 2022-05-22 01:19:00 +02:00
Laurent Destailleur
4cc1f67632 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/bank/line.php
 2022-05-16 16:03:07 +02:00
Frédéric FRANCE
e6c103733e dlc dluo are inverted 2022-05-16 11:06:21 +02:00
Laurent Destailleur
2dc97ac3ae Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/errors.lang
 2022-05-10 17:16:11 +02:00
Laurent Destailleur
7b21e0b6ff Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-05-10 16:06:32 +02:00
Francis Appels
10e13286d3 Add missing reception back to draft error handling 2022-05-05 11:08:17 +02:00
Francis Appels
40da139225 Add hook massaction to reception list. 2022-04-25 13:58:33 +02:00
Laurent Destailleur
26c3e235cf Merge pull request #19459 from frederic34/productmerge 
can merge products
 2022-04-07 15:02:03 +02:00
Laurent Destailleur
26f7a50838 Update linkedobjectblock.tpl.php 2022-04-05 14:15:27 +02:00
Alexandre SPANGARO
5f6c5ccf92 NEW Supplier order - Show ref supplier of reception in linked object block 2022-04-04 16:25:31 +02:00
Laurent Destailleur
95dc25587c Standardize code of the fetch_lines() 2022-03-28 13:50:47 +02:00
Laurent Destailleur
4a80f35aaa Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
 2022-03-23 17:26:25 +01:00
Laurent Destailleur
289c32b880 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-03-23 17:23:35 +01:00
Laurent Destailleur
c620757dbc Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/langs/en_US/projects.lang
	htdocs/product/price.php
	htdocs/reception/class/reception.class.php
 2022-03-23 17:23:21 +01:00
Laurent Destailleur
32f2499c36 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/langs/en_US/projects.lang
	htdocs/langs/en_US/propal.lang
	htdocs/product/price.php
	htdocs/projet/card.php
	htdocs/reception/class/reception.class.php
 2022-03-23 17:04:31 +01:00
Ferran Marcet
ccf8b01020 Fix: The origin of the stock movement is not being recorded 2022-03-22 13:46:55 +01:00
lvessiller
5914f2ac65 FIX include discount price for PMP after a reception (Issue #20029) 2022-03-22 11:17:27 +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