lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
117,307 Commits 43 Branches 150 Tags 886 MiB
5bbfdbb775
Commit Graph

2076 Commits

Author SHA1 Message Date
Laurent Destailleur
fa7254be9a Fix picto and perm 2022-05-03 17:05:14 +02:00
Gauthier PC portable 024
83e8e07416 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/addline_with_position_choice_develop 2022-04-08 09:25:08 +02:00
Laurent Destailleur
4693ef42bd Enhance responsive 2022-04-07 11:18:56 +02:00
Laurent Destailleur
f17db2a919 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-04-05 15:33:29 +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
a51c868a8e Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
 2022-04-01 14:40:50 +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
bc938d86ba NEW Can enter price with tax for predefined products on purchase objects 2022-03-26 11:22:54 +01:00
Laurent Destailleur
08bc2a7ac0 Better modulebuilder design pattern 2022-03-24 19:27:42 +01: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
Ferran Marcet
ccf8b01020 Fix: The origin of the stock movement is not being recorded 2022-03-22 13:46:55 +01:00
Laurent Destailleur
98cc40ac8d Fix a useless group by 2022-03-17 13:57: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
079fcacf13 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/products.lang
 2022-03-17 00:16:14 +01:00
Sylvain Legrand
e97932301b DLC and DLUO are reversed in the called function 2022-03-16 22:15:49 +01:00
Jé GDSOFT
6080e1f988 fix : keep lines order when creating invoices from receptions 2022-03-15 14:59:26 +01:00
Gauthier PC portable 024
5b715978e4 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/addline_with_position_choice_develop 2022-03-10 10:02:57 +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
e96061dd18 Fix phpunit SecurityTest 2022-02-22 23:46:57 +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
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
Gauthier PC portable 024
3abe391f65 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/addline_with_position_choice_develop 2022-01-28 15:08:02 +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
Laurent Destailleur
acafc69baa Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2022-01-23 16:13:20 +01:00
Laurent Destailleur
251609eb26 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2022-01-23 16:12:27 +01:00
Laurent Destailleur
0ee0bfed85 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/fourn/commande/card.php
	test/phpunit/testvirus.txt
 2022-01-23 13:04:37 +01:00
Laurent Destailleur
22a3b5ea78 FIX deletion of supplier order when draft 2022-01-18 16:24:28 +01:00
Laurent Destailleur
200f796232 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-01-18 16:08:54 +01:00
Laurent Destailleur
75eb256589 Fix perm to delete a draft supplier order 2022-01-18 16:06:27 +01:00
lvessiller
a9c76f2e44 FIX replace print error with event message when error on update line in supplier order 2022-01-14 16:09:30 +01:00
Laurent Destailleur
91b2d59458 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-01-14 10:37:41 +01:00
Laurent Destailleur
53e65095a7 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/commande/card.php
	htdocs/expedition/card.php
	htdocs/fourn/commande/card.php
	htdocs/fourn/commande/list.php
	htdocs/fourn/facture/card.php
 2022-01-14 10:36:46 +01:00
Laurent Destailleur
9dde80dd52 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/expedition/card.php
	htdocs/fourn/commande/list.php
 2022-01-14 10:30:39 +01:00
lvessiller
cacff0c2d4 FIX cast int for search user 2022-01-13 16:18:57 +01:00
lvessiller
22f6d204a2 FIX search by user in supplier order list 2022-01-13 16:01:23 +01:00
Laurent Destailleur
13510b9929 Clean sortfield, sortorder 2022-01-13 11:17:25 +01:00
Gauthier PC portable 024
6799d48944 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/addline_with_position_choice_develop 2022-01-11 09:59:25 +01:00
Laurent Destailleur
18978ac84e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2022-01-06 16:08:49 +01:00
BENKE Charlene
883d6bd63a
Update card.php 2022-01-04 09:32:27 +01:00
BENKE Charlene
0bc33ef3b3
Create card.php 2022-01-04 09:26:10 +01:00
stickler-ci
4e1d4ea1ca Fixing style errors. 2022-01-04 08:23:49 +00:00
BENKE Charlene
e73573d7c4
fix : allow create from other external modules 2022-01-04 09:18:28 +01:00
Je2fb
369d125002
Update card.php 
Fix bug when you create a supplier order from a project to keep the project when you select the supplier (Option RELOAD_PAGE_ON_SUPPLIER_CHANGE)
 2021-12-23 22:47:30 +01:00
Laurent Destailleur
c08cc96c71
Merge pull request #19592 from Hystepik/develop#2 
Fix #19545 : supplier order modification
 2021-12-16 17:47:34 +01:00
Laurent Destailleur
bb1d5daa82 css 2021-12-12 23:47:40 +01:00
lmarcouiller
0fc9be27bc Fix #19545 : supplier order modification 2021-12-10 11:26:19 +01:00
Laurent Destailleur
160c8402ea
Merge pull request #19524 from 1ocate/typoReceive 
Fix typo 'usercanreceived' -> 'usercanreceive' in '/htdocs/fourn/commande/card.php'
 2021-12-08 21:39:55 +01:00
Laurent Destailleur
5007282d7a Fix missing info popup on product 2021-12-08 15:16:06 +01:00
Jay Yeo
63c7ab0302 Fix typo 'usercanreceived' -> 'usercanreceive' in 'card.php' 2021-12-01 14:29:24 +07:00
Laurent Destailleur
4189229b84
Merge pull request #19165 from Hystepik/develop#5 
Fix: php 8.0 warning commercial part
 2021-11-30 15:31:51 +01:00
Gauthier PC portable 024
e02405edc9 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/addline_with_position_choice_develop 2021-11-22 16:23:26 +01:00
Gauthier PC portable 024
9840c1e0fa Merge branch 'NEW/addline_with_position_choice' of github.com:atm-gauthier/dolibarr into NEW/addline_with_position_choice_develop 2021-11-22 16:17:55 +01:00
Gauthier PC portable 024
e75b6ae0b4 FIX : it's better with an input number 2021-11-22 16:13:46 +01:00
Laurent Destailleur
63cd06394f Debug permission on supplier order. 
Fix #huntr58ddbd8a-0faf-4b3f-aec9-5850bb19ab67
 2021-11-20 15:41:31 +01:00
lmarcouiller
d1f5cb9184 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#5 2021-11-19 14:01:52 +01:00
Gauthier PC portable 024
23249751d5 FIX : reorder all lines when delete document line everywhere 2021-11-17 12:10:12 +01:00
Gauthier PC portable 024
375dcf7028 FIX : dev name 2021-11-16 16:42:48 +01:00
Gauthier PC portable 024
9d41c1390d Merge branch 'NEW/addline_with_position_choice' of github.com:atm-gauthier/dolibarr into NEW/addline_with_position_choice_develop 2021-11-16 14:20:24 +01:00
Gauthier PC portable 024
1e0d7d92a9 NEW : addline with position choice when MAIN_VIEW_LINE_NUMBER is enabled 2021-11-16 14:09:18 +01:00
Alexandre SPANGARO
d611b99d95 GNU version 3 2021-11-09 03:01:48 +01:00
Laurent Destailleur
fe7e1d4118 Look and feel v15 2021-10-29 09:40:38 +02:00
Laurent Destailleur
ad2e567571 Fix bug huntr.dev 2021-10-25 15:32:10 +02:00
Laurent Destailleur
f2cd7a7a56 Removed the div class="ficheaddleft" 2021-10-24 00:37:37 +02:00
Lucas Marcouiller
051f6ca717 Fix: php 8.0 warning commercial part 2021-10-23 23:12:42 +02:00
Frédéric FRANCE
9bd31d2b85
fix warnings 2021-10-23 07:13:08 +02:00
Frédéric FRANCE
46c4f28478
fix multiple warnings 2021-10-22 22:15:59 +02:00
Laurent Destailleur
e43b33028c Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/card.php
 2021-10-20 15:06:10 +02:00
Laurent Destailleur
289f90fb1e Fix qty must not use html type "number" but "text" (need decimal values) 2021-10-20 11:05:40 +02:00
Laurent Destailleur
c40a73162e Look and feel v15 2021-10-18 21:20:58 +02:00
Laurent Destailleur
f8010dfcbc Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/reception/list.php
	htdocs/takepos/pay.php
 2021-10-16 13:01:03 +02:00
Laurent Destailleur
507d5962ab
Merge pull request #18960 from vincentjdc/project-edit-fordid-supplier-order 
Add an option to forbid changing the project of a supplier order
 2021-10-13 01:55:37 +02:00
Laurent Destailleur
365d5d4588
Update card.php 2021-10-13 01:55:24 +02:00
Vincent Dieltiens
7f07d82d3f Rename FORBID_EDIT_PROJECT_ON_SUPPLIER_ORDER into SUPPLIER_ORDER_FORBID_EDIT_PROJECT 2021-10-12 23:34:00 +02:00
Vincent Dieltiens
d58f334348 Add date_valid and date_approve columns in the list of supplier orders 2021-10-12 21:34:24 +02:00
Vincent Dieltiens
8370973a9d Add an option to forbird changing the project of a supplier order if validated or if in draft but already has a reference (not ) 2021-10-12 15:17:14 +02:00
lvessiller
be4a00213c FIX optional visibility on create card 2021-10-08 15:58:08 +02:00
Laurent Destailleur
ad1cb443e4
Merge pull request #18520 from cfoellmann/PR/pdf-no-template 
allow supplier order to not generate pdfs
 2021-10-06 15:35:08 +02:00
Laurent Destailleur
37603b451a Fix token in url 2021-09-27 12:24:01 +02:00
Laurent Destailleur
5c8fb38426 Fix add del* action into list of sensitive actions 2021-09-19 14:41:46 +02:00
Laurent Destailleur
d760686239 Fix case of newtoken() 2021-09-18 22:24:00 +02:00
Laurent Destailleur
0749d01c5a Fix add action delete* as sensitive action 2021-09-18 22:04:41 +02:00
Laurent Destailleur
8bdc53f469 Fix Add action classify as sensitive actions 2021-09-18 20:49:24 +02:00
Laurent Destailleur
7dfedd242a Fix add confirm_deleteline as sensitive action 2021-09-18 19:43:38 +02:00
Laurent Destailleur
62b721a904 Add deletecontact as sentitive action 
Replace dol_buildpath with DOL_URL_ROOT
 2021-09-18 19:34:46 +02:00
Laurent Destailleur
6df4f250a5
Update list.php 2021-09-09 14:21:20 +02:00
stickler-ci
3da71418ac Fixing style errors. 2021-09-09 08:52:26 +00:00
atm-gregr
b88a16b563 Merge branch '11.0_SupplierOrder_ValidateMassAction' of github.com:atm-gregr/dolibarr into NEW/develop_SupplierOrder_ValidateMassAction 2021-09-09 10:49:05 +02:00
atm-gregr
24117851cc NEW : massaction validate on supplier orders 2021-09-09 10:43:15 +02:00
Laurent Destailleur
ba38bfd038
Merge pull request #18616 from cfoellmann/fix-redirect-soc 
fix GET parameter on redirect
 2021-09-09 04:58:44 +02:00
Laurent Destailleur
034c5651c8 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/eventorganization/class/conferenceorbooth.class.php
	htdocs/langs/en_US/eventorganization.lang
	htdocs/public/eventorganization/attendee_subscription.php
 2021-09-08 22:13:35 +02:00
Laurent Destailleur
30856d5b18 FIX Relative discount with high nb of decimals 2021-09-08 22:09:02 +02:00
Christian Foellmann
c3f1ecb981 fix GET parameter on redirect 2021-09-06 09:14:19 +02:00
Laurent Destailleur
ee066ad725 Cast sql var 2021-09-03 21:25:43 +02:00
Laurent Destailleur
77e9f15360 Work on #18448 2021-09-02 22:52:17 +02:00
Givriz
688d217bed Compatibility phpv8 2021-09-01 16:39:28 +02:00
Laurent Destailleur
fb8723d884
Merge pull request #18487 from cfoellmann/PR/fix-remaining-buttons 
replace remaining SubmitCancel buttons
 2021-08-28 18:39:06 +02:00
Laurent Destailleur
0db67b40a0
Merge pull request #18525 from cfoellmann/PR/thirdparty-links 
change links for thirdparty to target the type customer|supplier tab
 2021-08-28 15:27:13 +02:00
Laurent Destailleur
3d72a21396 Clean code 2021-08-28 03:09:41 +02:00
Laurent Destailleur
51a4d7630f Clean code 2021-08-28 00:56:37 +02:00
Laurent Destailleur
2dd91bf312 Clean code 2021-08-27 23:36:06 +02:00
Laurent Destailleur
46d993c9a6 Clean code 2021-08-27 22:42:04 +02:00
Laurent Destailleur
3b6559b1a6 Clean code by adding cast int. 2021-08-27 18:53:45 +02:00
Christian Foellmann
9752501ef6 change links for thirdparty to target the type customer|supplier tab 2021-08-27 15:32:53 +02:00
Christian Foellmann
9914ebe90b add missing actions to admin page 2021-08-27 10:21:02 +02:00
Christian Foellmann
f094b4c70c fix up most of the remaining submit inputs 2021-08-24 17:04:17 +02:00
Laurent Destailleur
90c12ae340 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-24 16:37:42 +02:00
Laurent Destailleur
07ab352877 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/list.php
 2021-08-24 16:37:18 +02:00
Laurent Destailleur
76c3f10842
Merge pull request #18438 from aspangaro/15a4 
NEW Supplier order - Add From/to input on search date
 2021-08-24 15:53:15 +02:00
Laurent Destailleur
22339a3ed3
Merge pull request #18451 from cfoellmann/PR/form-buttons-function 
improve forms - buttonsSaveCreate()
 2021-08-24 15:26:03 +02:00
Francis Appels
edeaa6009f Fix warning on supplier order card when reception enabled. 2021-08-24 10:48:26 +02:00
Laurent Destailleur
dc006b0ebb Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
 2021-08-23 19:44:02 +02:00
Laurent Destailleur
23829ae637 Cast numeric into on sql request 2021-08-23 18:56:46 +02:00
Laurent Destailleur
d4b5ee6c85 Fix cast into variable into sql request. 2021-08-23 17:41:11 +02:00
Christian Foellmann
d706c3b1ec use Forms::buttonsSaveCreate() to generate most of the Save|Cancel forms combination 2021-08-20 14:41:30 +02:00
Alexandre SPANGARO
797372cac2 NEW Supplier order - Add From/to input on search date 2021-08-18 22:30:33 +02:00
Laurent Destailleur
ae28dad72e Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-17 18:08:40 +02:00
Laurent Destailleur
955e9de1b7 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/product/reassortlot.php
	htdocs/product/stock/product.php
	htdocs/product/stock/productlot_card.php
	htdocs/reception/card.php
 2021-08-17 18:07:10 +02:00
Laurent Destailleur
c0a086fad8 Sellby always before Eatby #18361 2021-08-17 17:55:00 +02:00
Christian Foellmann
b9cb04d4b7
Merge branch 'develop' into agenda-fcomm-cancel 2021-07-29 08:14:02 +02:00
Laurent Destailleur
9dc45ac6ec
Merge pull request #18251 from cfoellmann/improve-makeorder 
Improve makeorder
 2021-07-28 15:41:09 +02:00
Christian Foellmann
51cfeddaaf add cancel button to classifyreception form on supplier_orders 2021-07-27 16:51:14 +02:00
Christian Foellmann
cefbcf03f6 fix cancel on makeorder (supplier_order) 2021-07-27 16:18:06 +02:00
Christian Foellmann
8b118670c3 fix agenda item refuse 2021-07-27 15:11:13 +02:00
Christian Foellmann
faf50a5aaa add agenda auto creation on supplier_order cancellation 2021-07-27 15:06:28 +02:00
Laurent Destailleur
d91051488c
Merge pull request #18125 from fr69400/develop 
NEW add hookmanager on note pages
 2021-07-11 20:25:16 +02:00
stickler-ci
48846888cc Fixing style errors. 2021-07-11 07:48:30 +00:00
fr69400
beaee09c98
Update note.php 2021-07-11 09:48:15 +02:00
stickler-ci
4272f93aa4 Fixing style errors. 2021-07-09 16:41:41 +00:00
fr69400
e45d5c1d0d NEW add hookmanager on note pages 2021-07-09 18:36:21 +02:00
Laurent Destailleur
7013f01a41 Fix look and feel v14 2021-07-04 21:14:46 +02:00
lmarcouiller
903adadcc4 Fix Error type ent in fourn/commande/list.php 2021-07-02 16:05:14 +02:00
Francis Appels
69affc5df5 Fix php 8 warnings 2021-06-28 16:25:16 +02:00
Laurent Destailleur
8b0c2d997c Clean code 2021-06-14 19:28:38 +02:00
Laurent Destailleur
fb46ece906 Fix yogosha 6347 2021-06-09 15:36:47 +02:00
Laurent Destailleur
fa4786a3f6 Fix permission 2021-06-08 16:19:21 +02:00
Laurent Destailleur
703001c625
Merge pull request #17532 from ibuiv/ibuiv-status-suppliers-hooks 
New Hooks to rename Supplier Orders statuses
 2021-06-05 02:11:29 +02:00
Francis Appels
01f5a5fb18 Fix update receipt eatby 2021-06-04 12:38:04 +02:00
Laurent Destailleur
8d5c419f92
Merge pull request #17744 from fappels/14_fix_trigger_delete_dispatch 
Fix dispatch receipt edit and delete
 2021-06-04 12:37:05 +02:00
Laurent Destailleur
3a201fa017
Merge pull request #17776 from dolibit-ut/patch-338 
Update card.php
 2021-06-04 10:35:28 +02:00
Laurent Destailleur
4c592401e6
Merge pull request #17781 from cfoellmann/refuse-note 
ADD note to supplier order refusal
 2021-06-04 10:10:17 +02:00
Laurent Destailleur
3ae3137eaf Missing picto 2021-06-04 08:57:48 +02:00
Christian Foellmann
55d48077a3 ADD note to supplier order refusal 2021-05-31 10:45:34 +02:00
UT from dolibit
fed7878d18
Update card.php 
$lineid  was duplicate
 2021-05-31 10:33:36 +02:00
Francis Appels
48f5cea917 Fix update receipt eatby 2021-05-27 16:03:17 +02:00
Frédéric FRANCE
1662d4a829
fix warnings 2021-05-25 23:14:36 +02:00
Laurent Destailleur
714334c585
Merge pull request #17698 from OPEN-DSI/new-translate-order-supplier 
NEW translate supplier order menus and button
 2021-05-25 20:34:17 +02:00
Laurent Destailleur
a09db63c7b Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/balance.php
	htdocs/contrat/list.php
	htdocs/don/class/api_donations.class.php
	htdocs/societe/class/societe.class.php
 2021-05-25 20:17:54 +02:00
Laurent Destailleur
1b5f7b78b5 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-05-25 20:12:34 +02:00
lvessiller
38bd595ebd NEW translate supplier order menus and button 2021-05-21 14:18:46 +02:00
Laurent Destailleur
04e9f2c988 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/admin/translation.php
 2021-05-20 15:00:39 +02:00
lvessiller
e2e6d4ba14 FIX keep special code on supplier order lines for external modules 2021-05-19 14:29:46 +02:00
Laurent Destailleur
4e5a3a22c8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-05-17 13:36:48 +02:00
Laurent Destailleur
7d82a20995 Add missing property 2021-05-17 13:36:27 +02:00
Francis Appels
c3bea1b46e Fix: Add test to delete supplier order if reception exist 2021-05-17 12:00:56 +02:00
Antonin MARCHAL
1bfcfc3a0c rename Hook and moved it into LibStatut method 2021-05-12 16:55:03 +02:00
Laurent Destailleur
e3cb04e235
Merge pull request #17540 from ibuiv/ibuiv-supplierorder-hooks 
New Hooks for Supplier Order Card tabs
 2021-05-11 19:12:24 +02:00
Laurent Destailleur
a4f9025843
Merge pull request #17541 from fappels/14_debug_dispatch 
Fix edit-delete from dispatch card when reception activated.
 2021-05-11 19:03:18 +02:00
Frédéric FRANCE
dc90103526
Update document.php 2021-05-11 18:36:27 +02:00
Alexandre SPANGARO
a830e498de Merge remote-tracking branch 'upstream/develop' into 14b7 2021-05-11 07:01:39 +02:00
Laurent Destailleur
ed18045807 FIX The comment of a reception was not correctly managed 2021-05-10 11:30:37 +02:00
Francis Appels
cd8c71497d replace deprecated warehouse 'libelle' 2021-05-10 10:10:30 +02:00
Alexandre SPANGARO
7993e4634a Fix Title supplier order info card 2021-05-10 07:01:24 +02:00
Alexandre SPANGARO
eccd883156 Fix Title supplier order document card 2021-05-10 06:54:17 +02:00
Alexandre SPANGARO
db50f8c27b Fix Title supplier order note card 2021-05-10 06:49:49 +02:00
Alexandre SPANGARO
9f0cdb0153 Fix Title supplier order contact card 2021-05-10 06:48:27 +02:00
Alexandre SPANGARO
1f00689831 Fix Title supplier order card 2021-05-10 06:46:07 +02:00
antonin_tdj
60671f1c78
Merge pull request #1 from ibuiv/ibuiv-develop 
Ibuiv develop
 2021-05-08 15:55:15 +02:00
Francis Appels
7101c2445d Fix dispatch, only edit received lines on draft reception. 
No stock movement on reception.
 2021-05-08 12:42:58 +02:00
Antonin MARCHAL
6b55b9fb28 add (hooks) init hooks on all tabs for supplier order 2021-05-08 11:45:07 +02:00
Antonin MARCHAL
a91d1b2e07 add(list) hook 2021-05-07 17:09:39 +02:00
Antonin MARCHAL
c6d646f39e add(prop)list 2021-05-07 17:08:36 +02:00
Laurent Destailleur
d1f11d2e65
Merge pull request #17429 from fr69400/develop 
FIX formAddObjectLine cant be overloaded by hook
 2021-05-03 13:16:45 +02:00
Laurent Destailleur
edd178c373
Update list.php 2021-04-30 12:09:42 +02:00
lmarcouiller
484f6f275f Fix #17424 : preg_match error on List of purchase orders 2021-04-30 10:56:47 +02:00
fr69400
d9e25c61bb formAddObjectLine cant be overloaded by hook 2021-04-29 15:32:15 +02:00
Laurent Destailleur
fd2d317b4a Fix #yogosha5881 2021-04-25 15:55:36 +02:00
fr69400
bd5c03f1a0 Update contact.php 2021-04-16 11:02:17 +02:00
fr69400
6ea94c6e0c
Update contact.php 2021-04-16 10:36:24 +02:00
Laurent Destailleur
dcf460e248 Use css on img_picto 2021-04-14 12:28:01 +02:00
Anthony Berton
707bf5adca picto_mass_actions 2021-04-14 10:20:34 +02:00
Laurent Destailleur
358bb87ae2 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/index.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/payments.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/projet/card.php
	htdocs/public/payment/newpayment.php
	htdocs/societe/list.php
	htdocs/ticket/document.php
 2021-04-13 20:19:05 +02:00
Alexandre SPANGARO
44133166de Merge remote-tracking branch 'upstream/develop' into 14a36 2021-04-12 21:35:03 +02:00
Alexandre SPANGARO
4b9bf40a8f move include_once to include when it's a tpl 2021-04-12 21:25:58 +02:00
Laurent Destailleur
8a62d97b89 Remove one thousand of useless files 2021-04-12 15:57:16 +02:00
Laurent Destailleur
81487d76b2 Clean code of ol deprecated option 2021-04-12 15:37:26 +02:00
Alexandre SPANGARO
8d72448f43 Add right supplier_order 2021-04-12 09:47:16 +02:00
Alexandre SPANGARO
87cc1b2601 Add right supplier_invoice 2021-04-12 07:37:34 +02:00
Alexandre SPANGARO
2d77b9bdf0 Work on split module fournisseur 2021-04-12 06:15:47 +02:00
Alexandre SPANGARO
ce7c5a0c7b Work on split module fournisseur 2021-04-11 04:24:21 +02:00
Laurent Destailleur
12e847ade1 Fix color of reports. Fix include_once into include. 2021-04-06 22:18:32 +02:00
Laurent Destailleur
5c2ee240b2 FIX #yogosha5752 2021-03-29 15:59:37 +02:00
Laurent Destailleur
ce1f8289a4 FIX #yogosha5746 2021-03-29 15:07:23 +02:00
Laurent Destailleur
b929641fe1 Look and feel v14 2021-03-29 13:00:17 +02:00