lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
116,997 Commits 43 Branches 150 Tags 886 MiB
fa856424a4
Commit Graph

487 Commits

Author SHA1 Message Date
Frédéric FRANCE
185f8896c5
fix display date creation 2022-08-29 16:52:27 +02:00
Frédéric France
e78f9a56be use isModEnabled 2022-08-23 20:16:28 +02:00
Frédéric France
86a7a7c8bb use isModEnabled 2022-08-23 20:05:09 +02:00
Frédéric France
582f6b196e use isModEnabled 2022-08-23 20:02:37 +02:00
Frédéric France
4bef0f5745 use isModEnabled 2022-08-23 20:01:34 +02:00
Laurent Destailleur
25e034721c Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-11 00:06:57 +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
2ce695f939 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-10 19:48:20 +02:00
Laurent Destailleur
c0977e5ee8
Merge pull request #21469 from cfoellmann/PR/card-empty-action 
FIX default to create on card.php if $action is empty
 2022-07-10 18:50:48 +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
Laurent Destailleur
8f819abd61 Fix doc 2022-07-10 18:35:23 +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
Christian Foellmann
aaca9bc03d default to create on card.php if $action is empty 2022-07-08 09:16:02 +02:00
Laurent Destailleur
a871aa8f85
Merge pull request #21382 from fboitel/NEW#20650 
NEW #20650 Checkbox column on left for lists
 2022-07-07 21:48:51 +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
Faustin
d2e7ff3bfb NEW #20650 completing checkcolumn on left for reception list 2022-06-24 17:38:58 +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
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
Laurent Destailleur
983bfc4ca9 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/dict.php
 2022-03-16 22:02:40 +01:00
Laurent Destailleur
b0720902d6 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-03-16 21:53:28 +01:00
Alexandre SPANGARO
5a2ed9461f FIX Reception - Error on trackid 2022-03-16 08:58:01 +01:00
Jé GDSOFT
6080e1f988 fix : keep lines order when creating invoices from receptions 2022-03-15 14:59:26 +01:00
John Livingston
1ece554c92
Fix: typo in template name 
There was a typo in generated HTML comment.
 2022-03-01 17:39:38 +01:00
Laurent Destailleur
0d024147bf Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-28 22:36:31 +01:00
Laurent Destailleur
dfba29b3c6 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/api/class/api.class.php
	htdocs/compta/facture/card.php
	htdocs/reception/list.php
 2022-02-28 22:30:17 +01:00
Frédéric FRANCE
018fc53554
Merge remote-tracking branch 'upstream/develop' into productmerge 2022-02-27 08:40:01 +01:00
Laurent Destailleur
e96061dd18 Fix phpunit SecurityTest 2022-02-22 23:46:57 +01:00
Frédéric FRANCE
b277ab9ee3
Merge remote-tracking branch 'upstream/develop' into productmerge 2022-02-22 21:49:17 +01:00
atm-greg
7b655a1ae2 fix missing hooks and line total for totalizable extrafields 2022-02-21 11:25:28 +01:00
lvessiller
9b1d800311 NEW add triiger and event on totally received status 2022-02-16 20:52:01 +01:00
lvessiller
690a91d546 NEW automatically set totally received status in reception 2022-02-16 20:51:47 +01:00
Laurent Destailleur
dfcc49d466 Doc 2022-02-16 20:50:27 +01:00
Laurent Destailleur
67168ffb16
Merge pull request #20065 from Easya-Solutions/new-reception-all-products 
NEW automatically set totally received status in reception
 2022-02-16 20:48:50 +01:00
Frédéric FRANCE
eb77f10d7b
Merge remote-tracking branch 'upstream/develop' into productmerge 2022-02-15 19:11:24 +01:00
Frédéric FRANCE
935482ee22
uniformize 2022-02-15 19:04:18 +01:00
Frédéric FRANCE
a613553f37
Merge branch 'hookgetnomurl' into patch-1 2022-02-15 18:44:06 +01:00
lvessiller
533bf15b86 NEW add triiger and event on totally received status 2022-02-15 09:54:40 +01:00
lvessiller
384e1d515b NEW automatically set totally received status in reception 2022-02-14 18:07:18 +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
13510b9929 Clean sortfield, sortorder 2022-01-13 11:17:25 +01:00
Laurent Destailleur
f51720879b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-01-13 11:05:57 +01:00
Laurent Destailleur
dc3670bc91 Clean search_status 2022-01-13 11:00:52 +01:00
Laurent Destailleur
ef56631c80 FIX #yogosha8186 2022-01-03 18:15:19 +01:00
Laurent Destailleur
e555683787 Fix unexpected code 2021-12-21 14:46:44 +01:00
Laurent Destailleur
fbce09f21b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/customer/index.php
	htdocs/compta/facture/card.php
	htdocs/reception/card.php
 2021-12-19 00:36:22 +01:00
Laurent Destailleur
98ddfbf792 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/compta/facture/info.php
	htdocs/compta/facture/list.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/lib/pdf.lib.php
	htdocs/fourn/facture/list.php
	htdocs/mrp/mo_movements.php
	htdocs/product/stock/movement_card.php
	htdocs/product/stock/movement_list.php
	htdocs/product/stock/replenishorders.php
	htdocs/reception/card.php
	htdocs/supplier_proposal/list.php
 2021-12-19 00:17:37 +01:00
Laurent Destailleur
1cc0f8e15f
Merge pull request #18167 from ATM-Consulting/FIX_13.0_extrafields_inoperative_in_receptions 
FIX: line extrafields are inoperative in dispatch cards even when they exist
 2021-12-16 18:54:38 +01:00
Laurent Destailleur
dce555f53f Fix missing document tab on receptions 2021-12-10 18:57:25 +01:00
Laurent Destailleur
ea45fdce5c
Merge pull request #19535 from Hystepik/develop#4 
Fix : php 8.0 warnings
 2021-12-08 18:44:16 +01:00
Laurent Destailleur
6886cca1fa CSS 2021-12-07 02:35:46 +01:00
lmarcouiller
ed7bfb333b fix php8.0 errors 2021-12-01 16:24:57 +01:00
lmarcouiller
171ecaa81d fix php8.0 warnings 2021-12-01 15:40:53 +01:00
Christian Foellmann
6608f5f0d8 update all script tags to be uniform. language="javascript" removed 
https://developer.mozilla.org/en-US/docs/web/html/element/script#attr-language
 2021-11-29 15:09:18 +01:00
Christian Foellmann
819a76e16a remove some deprecated html attributes 
https://developer.mozilla.org/en-US/docs/web/html/element/td#attr-align
 2021-11-29 15:07:07 +01:00
Frédéric FRANCE
429e5cf517
can merge products but experimental 2021-11-23 22:02:55 +01:00
Frédéric FRANCE
dc3bfcfb87
can modify tooltip by reference 2021-11-22 19:57:26 +01:00
Laurent Destailleur
441af6b6fb Fix add rel="noopener noreferrer" 2021-11-22 02:35:55 +01:00