Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
119,231 Commits 36 Branches 189 Tags
8b7eaf360e58693a9365544cb1520f28ced7e626
Commit Graph

199 Commits

Author SHA1 Message Date
Laurent Destailleur
cd960d30df Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-08-27 16:01:05 +02:00
Laurent Destailleur
5c03db3b05 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-08-27 15:58:48 +02:00
Laurent Destailleur
3b6b9661fa Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-08-27 15:57:45 +02:00
VESSILLER
ebed2211b6 FIX reception odt dir output path 2023-08-23 11:24:09 +02:00
Laurent Destailleur
cbb6ca071a Fix #yogosha15157 2023-02-25 19:51:05 +01:00
Laurent Destailleur
1fdc8c83e8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-12-14 11:40:14 +01:00
Laurent Destailleur
50c76110bb Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2022-12-14 11:19:12 +01:00
Laurent Destailleur
16fee3f8d8 Merge pull request #23190 from frederic34/parametersoreder 
fix parameters order
 2022-12-14 00:24:12 +01:00
Frédéric FRANCE
10964e0212 doc 2022-12-12 12:53:50 +01:00
Frédéric FRANCE
c134090321 fix parameters order 2022-12-12 10:44:34 +01:00
Frédéric FRANCE
b8755bcf65 fix parameters order 2022-12-12 10:39:24 +01:00
Florian HENRY
3a734a1305 NEW: add batch lot for reception and squille PDF 2022-11-18 10:27:49 +01:00
FLIO
73db58a700 Fix(Scrutinizer) add public 2022-11-15 17:10:04 +01:00
Laurent Destailleur
b3fb15652d Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-11-06 23:07:07 +01:00
Laurent Destailleur
54c657e50c Fix negative reception was no more possible. Use hidden const to restore 2022-11-05 15:39:31 +01:00
Laurent Destailleur
035c08536c Standardization of the name of some constant (customer match supplier) 2022-10-27 03:32:03 +02:00
Laurent Destailleur
fb9ec11ffb Deprecated method set_billed() on shipment and reception class has been 
removed. Use setBilled() instead.
 2022-10-27 02:37:08 +02:00
Laurent Destailleur
f87ec74b9f Replace LEFT JOIN with EXISTS 2022-10-22 00:22:54 +02:00
Alexandre SPANGARO
2a8b32ff98 Use isModEnabled 2022-09-25 06:06:06 +02:00
Laurent Destailleur
3e246f4399 NEW Add option "Show price on the generated documents for receptions" 2022-09-23 09:21:07 +02:00
Laurent Destailleur
6fb9a4713c Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-09-21 01:30:40 +02:00
Laurent Destailleur
1f2ad8efbf FIX API reception return error 500 2022-09-21 01:13:53 +02:00
Frédéric France
fc01cc66cd fix php8 warnings 2022-08-31 21:55:55 +02:00
Frédéric France
4bef0f5745 use isModEnabled 2022-08-23 20:01:34 +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
Laurent Destailleur
7ce47ce786 Fix signature of getNbByMonth 2022-06-17 15:06:24 +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
Maxime Kohlhaas
6131d5a2b4 Fix scrutinizer 2022-05-22 01:19:00 +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
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
Laurent Destailleur
5d415b183e FIX Option to manage packaging. FIX size/length/volume of reception 2022-03-17 18:53:50 +01:00
Laurent Destailleur
7aeaaab7f0 Merge pull request #20365 from gdsoftdev/fix_invoicelineorders 
Fix : keep row order into invoices created from massactions
 2022-03-17 13:37:17 +01:00